diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 8676c550..0b7070fc 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: APK
-          path: build/app/outputs/flutter-apk/app-prod-release.apk
+          path: "*.apk"
           if-no-files-found: error
       - name: Publish Alpha
         run: cd android && fastlane alphaBuild
diff --git a/scripts/build_android.sh b/scripts/build_android.sh
index 8722da68..5f150ab3 100755
--- a/scripts/build_android.sh
+++ b/scripts/build_android.sh
@@ -13,3 +13,6 @@ flutter build appbundle --flavor prod --build-number="$BUILD_NUM" --dart-define=
 
 # Also building the apk, as it's useful for non Google Play users
 flutter build apk --flavor prod --build-number="$BUILD_NUM" --dart-define=INSTALL_SOURCE=fdroid --verbose
+
+BUILD_ID=$(make version | tail -n 1 | awk '{ print $4 }')
+cp build/app/outputs/flutter-apk/app-prod-release.apk gitjournal-$BUILD_ID.apk
\ No newline at end of file