diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f609844e67f887550fa2987e6890d5dcb191fbf..f5cee28b3c94b3de2f2d891332819e6555fb33ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,7 +163,7 @@ build:
     # Build debug APKs for each architecture
     - cd cardinal-android
     - touch local.properties
-    - ./gradlew assembleArm64Debug assembleX86_64Debug --info --stacktrace --no-daemon
+    - ./gradlew assembleArm64Debug --info --stacktrace --no-daemon
   artifacts:
     when: always
     paths:
@@ -258,16 +258,15 @@ release:
     - touch local.properties
     - |
       # Build APKs for each architecture
-      ./gradlew assembleArm64Release assembleX86_64Release --info --stacktrace --no-daemon
+      ./gradlew assembleArm64Release --info --stacktrace --no-daemon
+      ./gradlew assembleX86_64Release --info --stacktrace --no-daemon
       # Build AABs for each architecture
       ./gradlew bundleArm64Release bundleX86_64Release --info --stacktrace --no-daemon
   artifacts:
     paths:
       - cardinal-android/app/build/outputs/apk/arm64/release/app-arm64-release.apk
       - cardinal-android/app/build/outputs/apk/x86_64/release/app-x86_64-release.apk
-      - cardinal-android/app/build/outputs/bundle/arm64Release/app-arm64-release.aab
-      - cardinal-android/app/build/outputs/bundle/x86_64Release/app-x86_64-release.aab
-    expire_in: 30 days
+    expire_in: 7 days
   release:
     tag_name: $CI_COMMIT_TAG
     name: 'Cardinal Maps ${CI_COMMIT_TAG#v}'