diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2b4372270d..618b737c76c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,10 +149,6 @@ default:
       . ${SCRIPTS_DIR}/setup-test-env.sh
     - eval "$S3_JWT_FILE_SCRIPT"
 
-  after_script:
-    # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/20338
-    - find -name '*.log' -exec mv {} {}.txt \;
-
   # Retry when job fails. Failed jobs can be found in the Mesa CI Daily Reports:
   # https://gitlab.freedesktop.org/mesa/mesa/-/issues/?sort=created_date&state=opened&label_name%5B%5D=CI%20daily
   retry:
diff --git a/.gitlab-ci/build/gitlab-ci-inc.yml b/.gitlab-ci/build/gitlab-ci-inc.yml
index 4e4fc7d12a3..2dae5acb25e 100644
--- a/.gitlab-ci/build/gitlab-ci-inc.yml
+++ b/.gitlab-ci/build/gitlab-ci-inc.yml
@@ -70,7 +70,6 @@
       fi
   after_script:
     - if test -x /usr/bin/ccache; then ccache --show-stats | grep "Hits:"; fi
-    - !reference [default, after_script]
 
 .build-windows:
   extends: