diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 279632f..cd33ed0 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -174,6 +174,7 @@ jobs:
             fi
           fi
       - name: Upload debug APK
+        if: github.event_name == 'workflow_dispatch'
         uses: actions/upload-artifact@v5
         with:
           name: motorsignal-debug-apk
@@ -181,7 +182,7 @@ jobs:
             build/app/outputs/flutter-apk/app-debug.apk
             build/app/outputs/flutter-apk/app-debug.apk.sha256
           if-no-files-found: error
-          retention-days: 14
+          retention-days: 3
 
   release:
     name: Build signed release APK and AAB
@@ -328,7 +329,7 @@ jobs:
             build/app/outputs/flutter-apk/app-release.apk
             build/release-artifacts.sha256
           if-no-files-found: error
-          retention-days: 30
+          retention-days: 7
       - name: Upload release App Bundle
         uses: actions/upload-artifact@v5
         with:
@@ -337,7 +338,7 @@ jobs:
             build/app/outputs/bundle/release/app-release.aab
             build/release-artifacts.sha256
           if-no-files-found: error
-          retention-days: 30
+          retention-days: 7
       - name: Remove signing credentials
         if: always()
         shell: bash