diff --git a/.cirrus.yml b/.cirrus.yml
index b6cdd87e..af2c651c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -14,6 +14,8 @@ build_task:
         VERSION_CODE: 31340000
       - VERSION_NAME: "134.0"
         VERSION_CODE: 31340020
+  sb_gapi_script: mkdir -p "$(dirname "${SB_GAPI_KEY_FILE}")" && echo "${SB_GAPI_KEY}" > "${SB_GAPI_KEY_FILE}"
+  sources_scripts: ./scripts/get_sources.sh
   build_script: ./scripts/ci-build.sh
   apk_artifacts:
     path: gecko/mobile/android/fenix/app/build/outputs/apk/fenix/release/*.apk
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index a58e0657..90b797c5 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -7,15 +7,16 @@ set -eu
 set -o xtrace
 
 rootdir="$(dirname "$0")/.."
+rootdir=$(realpath "$rootdir")
 
 # Setup Android SDK
 source "$rootdir/scripts/setup-android-sdk.sh"
 
-# Download sources
-"$rootdir/scripts/get_sources.sh"
+# Setup paths
+source "$rootdir/scripts/paths_local.sh"
 
-# Setup API key for Google Safe Browsing
-mkdir -p "$(dirname "${SB_GAPI_KEY_FILE}")" && echo "${SB_GAPI_KEY}" > "${SB_GAPI_KEY_FILE}"
+# Patch
+"$rootdir/scripts/prebuild.sh" "${VERSION_NAME}" "${VERSION_CODE}"
 
 # Print the mozconfig for debugging purposes
 echo ""
@@ -24,14 +25,8 @@ cat  "$rootdir/gecko/mozconfig"
 echo "########################"
 echo ""
 
-# Setup paths
-source "$rootdir/scripts/paths_local.sh"
-
-# Patch
-"$rootdir/scripts/prebuild.sh" "${VERSION_NAME}" "${VERSION_CODE}"
-
 # Build
-"$rootdir/scripts/build.sh"
+bash "$rootdir/scripts/build.sh"
 
 # Build AAB
 pushd "$rootdir/gecko/mobile/android/fenix"