diff --git a/.gitea/workflows/android-build.yaml b/.gitea/workflows/android-build.yaml
index 78935c5..23ab6d7 100644
--- a/.gitea/workflows/android-build.yaml
+++ b/.gitea/workflows/android-build.yaml
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'
@@ -70,14 +70,20 @@ jobs:
 #          name: TorqueVault-apk
 #          path: androidApp/build/outputs/apk/debug/androidApp-debug.apk
 
-      - name: Read Version
+      - name: Build Package Version
+        shell: bash
         run: |
-          VERSION=$(grep -R "versionName" androidApp/build.gradle.kts \
+          VERSION_NAME=$(grep -R "versionName" androidApp/build.gradle.kts \
+            | head -1 \
             | sed 's/.*"\(.*\)".*/\1/')
 
-          echo "VERSION_NAME=$VERSION" >> $GITHUB_ENV
+          SHORT_SHA=$(git rev-parse --short HEAD)
 
-          echo "Version: $VERSION"
+          PACKAGE_VERSION="${VERSION_NAME}+${SHORT_SHA}"
+
+          echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
+
+          echo "Package Version: $PACKAGE_VERSION"
 
       - name: Upload APK to Package Registry
         run: |
@@ -86,4 +92,4 @@ jobs:
             --fail \
             --user "${{ github.actor }}:${{ secrets.PACKAGE_TOKEN }}" \
             --upload-file androidApp/build/outputs/apk/debug/androidApp-debug.apk \
-            "${{ github.server_url }}/api/packages/${{ github.repository_owner }}/generic/android-debug/${VERSION}/Torque-Vault.apk"
+            "${{ github.server_url }}/api/packages/${{ github.repository_owner }}/generic/android-debug/${$PACKAGE_VERSION}/Torque-Vault.apk"