diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index f3bf612ab9d..673d852dadb 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -10,19 +10,9 @@
 
 set -ex -o pipefail
 
+
 DEQP_VERSION=vulkan-cts-1.3.7.0
 
-git config --global user.email "mesa@example.com"
-git config --global user.name "Mesa CI"
-git clone \
-    https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b $DEQP_VERSION \
-    --depth 1 \
-    /VK-GL-CTS
-pushd /VK-GL-CTS
-
-mkdir -p /deqp
-
 # Patches to VulkanCTS may come from commits in their repo (listed in
 # cts_commits_to_backport) or patch files stored in our repo (in the patch
 # directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
@@ -43,14 +33,6 @@ cts_commits_to_backport=(
     c5453824b498c981c6ba42017d119f5de02a3e34
 )
 
-for commit in "${cts_commits_to_backport[@]}"
-do
-  PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch"
-  echo "Apply patch to VK-GL-CTS from $PATCH_URL"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
-    git am -
-done
-
 cts_patch_files=(
   # Android specific patches.
   build-deqp_Allow-running-on-Android-from-the-command-line.patch
@@ -61,6 +43,29 @@ cts_patch_files=(
   build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch
 )
 
+
+### Careful editing anything below this line
+
+
+git config --global user.email "mesa@example.com"
+git config --global user.name "Mesa CI"
+git clone \
+    https://github.com/KhronosGroup/VK-GL-CTS.git \
+    -b $DEQP_VERSION \
+    --depth 1 \
+    /VK-GL-CTS
+pushd /VK-GL-CTS
+
+mkdir -p /deqp
+
+for commit in "${cts_commits_to_backport[@]}"
+do
+  PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch"
+  echo "Apply patch to VK-GL-CTS from $PATCH_URL"
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
+    git am -
+done
+
 for patch in "${cts_patch_files[@]}"
 do
   echo "Apply patch to VK-GL-CTS from $patch"