diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f329d2d2b..53b47f9ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -135,7 +135,7 @@ win:container_prep:
 .monado.variables.debian:bullseye-ndk:
   variables:
     FDO_DISTRIBUTION_VERSION: "bullseye"
-    FDO_DISTRIBUTION_TAG: "2023-04-10.1"
+    FDO_DISTRIBUTION_TAG: "2023-10-28.0"
     FDO_REPO_SUFFIX: ndk
 
 # Variables for build and usage of Ubuntu focal image
@@ -179,7 +179,7 @@ debian:bullseye-ndk:container_prep:
     - .fdo.container-build@debian # from ci-templates
 
   variables:
-    FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake default-jdk-headless git glslang-tools libeigen3-dev meson ninja-build pkg-config python3 unzip wget'
+    FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake git glslang-tools libeigen3-dev meson ninja-build openjdk-17-jdk-headless pkg-config python3 unzip wget'
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/android_container_prep.sh'
 
 # Make Ubuntu focal image
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 7781a8146..0a523a3cb 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -138,7 +138,7 @@ distributions:
           pkg-config:
           ca-certificates:
           glslang-tools:
-          default-jdk-headless:
+          openjdk-17-jdk-headless:
         build_jobs:
           - name: "ndk:armeabi-v7a"
             cmake_defines: