diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 0d15b31b34d..92752efcd7a 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -326,9 +326,9 @@ fedora/x86_64_build:
     - .fdo.container-build@fedora
     - .container
   variables:
-    FDO_DISTRIBUTION_VERSION: 41
+    FDO_DISTRIBUTION_VERSION: 42
     MESA_IMAGE_TAG: &fedora-x86_64_build ${FEDORA_X86_64_BUILD_TAG}
-    LLVM_VERSION: &fedora-x86_64-llvm 19
+    LLVM_VERSION: &fedora-x86_64-llvm 20
 
 .use-fedora/x86_64_build:
   tags:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 96a9e05c27d..9a015286802 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -32,7 +32,7 @@ variables:
 
   ALPINE_X86_64_BUILD_TAG: "20250324-sphinx"
   ALPINE_X86_64_LAVA_SSH_TAG: "20250321-s3cp-fix5"
-  FEDORA_X86_64_BUILD_TAG: "20250321-s3cp-fix5"
+  FEDORA_X86_64_BUILD_TAG: "20250420-42"
 
   KERNEL_TAG: "v6.14-mesa-0bdd"
   KERNEL_REPO: "gfx-ci/linux"