diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml
index 25f942bff206..b2a0416c1627 100644
--- a/.github/workflows/manual_generate_apk.yml
+++ b/.github/workflows/manual_generate_apk.yml
@@ -11,6 +11,8 @@ on:
         options: 
         - NormalOptimized
         - NormalDebug
+        - VrDebug
+        - VrOptimized
 
 jobs:
 
@@ -23,12 +25,16 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
+
+      - name: Create a dummy tag (androidGitVersion need at least one tag to exist)
+        run: git tag dummy
         
       - name: Setup JDK
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
           java-version: '17'
+          cache: gradle
         
       #- name: Setup SDK
       #  uses: android-actions/setup-android@v2
@@ -37,9 +43,12 @@ jobs:
       #  uses: nttld/setup-ndk@v1
       #  with:
       #    ndk-version: r21e
+
+      - name: Test androidGitVersion
+        run: gradle --quiet androidGitVersion
       
       - name: Assemble APK
-        run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace
+        run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace --info
       
       #- name: Gradle Test
       #  run: bash ./gradlew test${{ github.event.inputs.buildVariant }}UnitTest --stacktrace
@@ -48,10 +57,8 @@ jobs:
         run: |
           find . -name "*.apk"
           mkdir ppsspp
-          if [ -e android/build/*/apk/*/*/android-normal-optimized.apk ]; then
-            cp android/build/*/apk/*/*/android-normal-optimized.apk ppsspp/
-          elif [ -e android/build/*/apk/*/*/android-normal-debug.apk ]; then
-            cp android/build/*/apk/*/*/android-normal-debug.apk ppsspp/
+          if [ -e android/build/*/apk/*/*/*.apk ]; then
+            cp android/build/*/apk/*/*/*.apk ppsspp/
           fi
 
       - name: Upload artifact