diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml
index 066083a..7db648e 100644
--- a/.github/workflows/android-release.yaml
+++ b/.github/workflows/android-release.yaml
@@ -42,14 +42,16 @@ jobs:
 
       - name: Build release APK
         working-directory: mobile
-        run: flutter build apk --release --split-per-abi
+        run: |
+          flutter build apk --release --split-per-abi
+          flutter build apk --release
 
       - name: Rename APKs with version tag
         run: |
-          VERSION_CODE=$(grep '^version:' mobile/pubspec.yaml | cut -d'+' -f2)
-          mv mobile/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk mobile/build/app/outputs/flutter-apk/elephant-${{ github.ref_name }}-${VERSION_CODE}1.apk
-          mv mobile/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk mobile/build/app/outputs/flutter-apk/elephant-${{ github.ref_name }}-${VERSION_CODE}2.apk
-          mv mobile/build/app/outputs/flutter-apk/app-x86_64-release.apk mobile/build/app/outputs/flutter-apk/elephant-${{ github.ref_name }}-${VERSION_CODE}3.apk
+          mv mobile/build/app/outputs/flutter-apk/app-release.apk mobile/build/app/outputs/flutter-apk/elephant-${{ github.ref_name }}-universal.apk
+          mv mobile/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk mobile/build/app/outputs/flutter-apk/elephant-${{ github.ref_name }}-armeabi-v7a.apk
+          mv mobile/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk mobile/build/app/outputs/flutter-apk/elephant-${{ github.ref_name }}-arm64-v8a.apk
+          mv mobile/build/app/outputs/flutter-apk/app-x86_64-release.apk mobile/build/app/outputs/flutter-apk/elephant-${{ github.ref_name }}-x86_64.apk
 
       - name: Create or update GitHub Release
         uses: softprops/action-gh-release@v2