diff --git a/.gitlab-ci/container/debian/gitlab-ci.yml b/.gitlab-ci/container/debian/gitlab-ci.yml
index d3159d5ca8e..c31d8499cab 100644
--- a/.gitlab-ci/container/debian/gitlab-ci.yml
+++ b/.gitlab-ci/container/debian/gitlab-ci.yml
@@ -185,7 +185,7 @@ debian/s390x_build:
     LLVM_VERSION: &debian-android-llvm 19
     CUTTLEFISH_PROJECT_PATH: gfx-ci/android/aosp-manifest
     CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus
-    CUTTLEFISH_BUILD_NUMBER: 20260315.001
+    CUTTLEFISH_BUILD_NUMBER: 20260402.001
 
 # Android NDK cross-build image
 debian/android_build:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 1974cd5d226..80d1eda0cc6 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,7 +23,7 @@ variables:
   DEBIAN_BUILD_TAG: "20260309-D3D619"
 
   DEBIAN_TEST_BASE_TAG: "20260201-deqp-runner"
-  DEBIAN_TEST_ANDROID_TAG: "20260317-deqp"
+  DEBIAN_TEST_ANDROID_TAG: "20260402-cuttlefish"
   DEBIAN_TEST_GL_TAG: "20260324-vvl-ad"
   DEBIAN_TEST_VIDEO_TAG: "20250813-vector"
   DEBIAN_TEST_VK_TAG: "20260310-vkd3d"