diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh
index 915d9948710..b1d463c9383 100644
--- a/.gitlab-ci/container/build-apitrace.sh
+++ b/.gitlab-ci/container/build-apitrace.sh
@@ -11,7 +11,7 @@ set -uex
 
 uncollapsed_section_start apitrace "Building apitrace"
 
-APITRACE_VERSION="952bad1469ea747012bdc48c48993bd5f13eec04"
+APITRACE_VERSION="6345d3130b3cbec07ba541e1121c8afc4aac2867"
 
 git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
 pushd /apitrace
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 91e045580c1..ee44c78a327 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -24,9 +24,9 @@ variables:
   DEBIAN_BUILD_TAG: "20250324-android"
 
   DEBIAN_TEST_ANDROID_TAG: "20250417-aosp-cts"
-  DEBIAN_TEST_GL_TAG: "20250416-pigtag"
-  DEBIAN_TEST_VK_TAG: "20250416-pigtag"
-  KERNEL_ROOTFS_TAG: "20250416-pigtag"
+  DEBIAN_TEST_GL_TAG: "20250418-apitrace"
+  DEBIAN_TEST_VK_TAG: "20250418-apitrace"
+  KERNEL_ROOTFS_TAG: "20250418-apitrace"
 
   DEBIAN_PYUTILS_TAG: "20250321-s3cp-fix5"