diff --git a/.gitea/workflows/default.yaml b/.gitea/workflows/default.yaml
index 8b0eb65e..85efbe19 100644
--- a/.gitea/workflows/default.yaml
+++ b/.gitea/workflows/default.yaml
@@ -15,15 +15,6 @@
 stages:
 - build-image
 - test
-
-
-    variables:
-      # Fetch submodules
-      GIT_SUBMODULE_STRATEGY: recursive
-      # Only fetch the latest commit (shallow clone, faster)
-      GIT_SUBMODULE_DEPTH: 1
-      GIT_DEPTH: 1
-
 # Builds the image and pushes it to the registry
 # This image contains all the tooling necessary to run the compilation tools
   build-image:
@@ -42,6 +33,11 @@ stages:
       - docker:dind
     variables:
       DOCKER_DRIVER: overlay2
+      # Fetch submodules
+      GIT_SUBMODULE_STRATEGY: recursive
+      # Only fetch the latest commit (shallow clone, faster)
+      GIT_SUBMODULE_DEPTH: 1
+      GIT_DEPTH: 1
     script:
       - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY     # Login to the registry
       - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true        # Pull the image if it exists
@@ -61,6 +57,12 @@ stages:
     image:
       name: $CI_REGISTRY_IMAGE:latest
       entrypoint: [""]
+    variables:
+      # Fetch submodules
+      GIT_SUBMODULE_STRATEGY: recursive
+      # Only fetch the latest commit (shallow clone, faster)
+      GIT_SUBMODULE_DEPTH: 1
+      GIT_DEPTH: 1
     before_script:
       # Download the baserom from $BASEROM_<VER>_URL, decrypt with $BASEROM_<VER>_KEY and save as baserom.us.v10.z64, and check the sha1sum against $BASEROM_<VER>_SHA1
       - curl -L "$BASEROM_US10_URL" -o baserom.us.v10.enc.z64