diff --git a/.cirrus.yml b/.cirrus.yml
index 613c4b009..d150203a9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,7 +7,7 @@ task:
     cpu: 8
     memory: 32G
   build_script:
-    - ./.github/scripts/build_aosp.sh aosp_arm64 userdebug android-14.0.0_r1
+    - ./.github/scripts/build_aosp.sh aosp_arm64 ap1a userdebug android-14.0.0_r29
   always:
     seedvault_artifacts:
       path: Seedvault.apk
diff --git a/.github/scripts/build_aosp.sh b/.github/scripts/build_aosp.sh
index 1cd2e4c1f..0dff6a379 100755
--- a/.github/scripts/build_aosp.sh
+++ b/.github/scripts/build_aosp.sh
@@ -52,8 +52,9 @@ retry() {
 }
 
 DEVICE=$1
-TARGET=$2
-BRANCH=$3
+RELEASE=$2
+TARGET=$3
+BRANCH=$4
 
 git config --global user.email "seedvault@example.com"
 git config --global user.name "Seedvault CI"
@@ -85,7 +86,7 @@ retry repo sync -c -j8 --fail-fast --force-sync
 while true; do echo "Still building..."; sleep 30; done &
 
 source build/envsetup.sh
-lunch $DEVICE-$TARGET
-m -j6 Seedvault
+lunch $DEVICE-$RELEASE-$TARGET
+m -j4 Seedvault
 
 mv /aosp/out/target/product/generic_arm64/system/system_ext/priv-app/Seedvault/Seedvault.apk "$CIRRUS_WORKING_DIR"