diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index 50969f5527a..403b8a18986 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -73,7 +73,6 @@ EPHEMERAL=(
     "llvm-${LLVM_VERSION}-dev"
     make
     meson
-    openssh-server
     patch
     pkgconf
     protobuf-compiler
@@ -89,6 +88,7 @@ DEPS=(
     apt-utils
     clinfo
     curl
+    dropbear
     git
     git-lfs
     inetutils-syslogd
@@ -131,6 +131,7 @@ DEPS=(
     python3-simplejson
     python3-six
     python3-yaml
+    sntp
     socat
     spirv-tools
     sysvinit-core
@@ -144,11 +145,16 @@ DEPS=(
     xauth
     xvfb
     zlib1g
-    zstd
 )
 
 HW_DEPS=(
     firmware-realtek
+    netcat-openbsd
+    mount
+    python3-distutils
+    python3-serial
+    tzdata
+    zstd
 )
 
 [ "$DEBIAN_ARCH" = "arm64" ] && ARCH_DEPS=(
@@ -169,7 +175,7 @@ apt-get dist-upgrade -y
 apt-get install --purge -y \
       sysvinit-core libelogind0
 
-apt-get install -y --no-remove "${DEPS[@]}"
+apt-get install -y --no-remove "${DEPS[@]}" "${HW_DEPS[@]}" "${ARCH_DEPS[@]}"
 
 apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 9bc8570396c..82670679597 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,16 +23,16 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250422-ci-fairy"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250414-goldilocks"
-  DEBIAN_TEST_GL_TAG: "20250414-goldilocks"
-  DEBIAN_TEST_VK_TAG: "20250414-goldilocks"
-  KERNEL_ROOTFS_TAG: "20250414-goldilocks"
+  DEBIAN_TEST_ANDROID_TAG: "20250423-rootfs"
+  DEBIAN_TEST_GL_TAG: "20250423-rootfs"
+  DEBIAN_TEST_VK_TAG: "20250423-rootfs"
+  KERNEL_ROOTFS_TAG: "20250423-rootfs"
 
   DEBIAN_PYUTILS_TAG: "20250422-ci-fairy"
 
-  ALPINE_X86_64_BUILD_TAG: "20250324-sphinx"
-  ALPINE_X86_64_LAVA_SSH_TAG: "20250422-ci-fairy"
-  FEDORA_X86_64_BUILD_TAG: "20250420-42"
+  ALPINE_X86_64_BUILD_TAG: "20250423-rootfs"
+  ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
+  FEDORA_X86_64_BUILD_TAG: "20250423-rootfs"
 
   KERNEL_TAG: "v6.14-mesa-dea4"
   KERNEL_REPO: "gfx-ci/linux"