diff --git a/.github/workflows/snapshots-android.yml b/.github/workflows/snapshots-android.yml
index aef9e707055..c593103a1af 100644
--- a/.github/workflows/snapshots-android.yml
+++ b/.github/workflows/snapshots-android.yml
@@ -8,6 +8,11 @@ on:
           description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
           required: false
           default: false
+        upload_package:
+          type: boolean
+          description: 'Upload the completed Android package'
+          required: false
+          default: true
   schedule:
     # * is a special character in YAML so you have to quote this string
     - cron:  '00 19 * * *'
@@ -116,6 +121,7 @@ jobs:
 
       - name: 📂 Sync files
         uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+        if: ${{ inputs.upload_package }}
         with:
           server: ftp.cardforge.org
           username: ${{ secrets.FTP_USERNAME }}
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index bb81ee8b75d..e2d7b325915 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -239,7 +239,6 @@
                                 <buildTools>30.0.3</buildTools>
                             </sdk>
                             <dexForceJumbo>true</dexForceJumbo>
-                            <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
                             <assetsDirectory>${project.basedir}/assets</assetsDirectory>
                             <resourceDirectory>${project.basedir}/res</resourceDirectory>
                             <nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>
@@ -266,6 +265,17 @@
                                 <dexArguments>--min-sdk-version=26</dexArguments>
                             </dex>
                         </configuration>
+                        <executions>
+                            <execution>
+                                <id>update-manifest</id>
+                                <goals>
+                                    <goal>manifest-merger</goal>
+                                </goals>
+                                <configuration>
+                                    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
+                                </configuration>
+                            </execution>
+                        </executions>
                     </plugin>
                 </plugins>
             </build>
@@ -306,7 +316,6 @@
                                 <verbose>false</verbose>
                             </zipalign>
                             <dexForceJumbo>true</dexForceJumbo>
-                            <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
                             <assetsDirectory>${project.basedir}/assets</assetsDirectory>
                             <resourceDirectory>${project.basedir}/res</resourceDirectory>
                             <nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>
@@ -333,6 +342,17 @@
                                 <dexArguments>--min-sdk-version=26</dexArguments>
                             </dex>
                         </configuration>
+                        <executions>
+                            <execution>
+                                <id>update-manifest</id>
+                                <goals>
+                                    <goal>manifest-merger</goal>
+                                </goals>
+                                <configuration>
+                                    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
+                                </configuration>
+                            </execution>
+                        </executions>
                     </plugin>
                 </plugins>
             </build>
@@ -414,6 +434,15 @@
                                     <goal>zipalign</goal>
                                 </goals>
                             </execution>
+                            <execution>
+                                <id>update-manifest</id>
+                                <goals>
+                                    <goal>manifest-merger</goal>
+                                </goals>
+                                <configuration>
+                                    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
                     <plugin>
diff --git a/forge-gui-android/AndroidManifest.xml b/forge-gui-android/src/main/AndroidManifest.xml
similarity index 100%
rename from forge-gui-android/AndroidManifest.xml
rename to forge-gui-android/src/main/AndroidManifest.xml