diff --git a/.cirrus.yml b/.cirrus.yml
index 0c32056edf..6345e8d273 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -115,12 +115,12 @@ test_analyze_task:
     PGP_PASSPHRASE: VAULT[development/kv/data/sign data.passphrase]
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
-  analyze_script:
+  submodules_script:
     - git submodule update --init --jobs 4
     - cd python-frontend/typeshed_serializer/resources/python-type-stubs
     - git sparse-checkout set stubs/sklearn
     - git checkout
-    - cd -
+  analyze_script:
     - source cirrus-env BUILD
     - DEPLOY_PULL_REQUEST=false regular_mvn_build_deploy_analyze -DfailStubGenerationFast=true -P-release,-sign -Dsonar.analysisCache.enabled=true -Dskip.its=true
   cleanup_before_cache_script: cleanup_maven_repository
@@ -132,13 +132,13 @@ build_win_task:
     # windows cache is buggy if using ${CIRRUS_WORKING_DIR}
     # Additionally "~" seems to resolve differently in the context of the cache and the context of the build_script below
     folder: C:/.m2/repository
-  build_script:
+  git_script:
     - git config --global core.autocrlf input
     - git submodule update --init --jobs 4
     - cd python-frontend/typeshed_serializer/resources/python-type-stubs
-    - git sparse-checkout set stubs/sklearn 
+    - git sparse-checkout set stubs/sklearn
     - git checkout
-    - cd -
+  build_script:
     - source cirrus-env CI
     - unset SONARSOURCE_QA
     - mvn.cmd package -Dmaven.repo.local=C:/.m2/repository -DskipTypeshed=true -DfailStubGenerationFast=true