diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index 071c89e6da..b46324cc6f 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -3,6 +3,10 @@ name: Build Mobile
 on:
   workflow_dispatch:
   workflow_call:
+    inputs:
+      ref:
+        required: false
+        type: string
   pull_request:
   push:
     branches: [main]
@@ -13,7 +17,17 @@ jobs:
     runs-on: macos-12
 
     steps:
+      - name: Determine ref
+        id: get-ref
+        run: |
+          input_ref="${{ inputs.ref }}"
+          github_ref="${{ github.sha }}"
+          ref="${input_ref:-$github_ref}"
+          echo "ref=$ref" >> $GITHUB_OUTPUT
+          
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ steps.get-ref.outputs.ref }}
 
       - uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 5a7f0aa23b..72f45108ff 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -18,14 +18,12 @@ on:
         type: boolean
 
 jobs:
-  build_mobile:
-    uses: ./.github/workflows/build-mobile.yml
-    secrets: inherit
-
-  tag_release:
+  bump_version:
     runs-on: ubuntu-latest
-    needs: build_mobile
-
+    
+    outputs:
+      ref: ${{ steps.push-tag.outputs.commit_long_sha }}
+    
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -36,6 +34,7 @@ jobs:
         run: misc/release/pump-version.sh -s "${{ inputs.serverBump }}" -m "${{ inputs.mobileBump }}"
 
       - name: Commit and tag
+        id: push-tag
         uses: EndBug/add-and-commit@v9
         with:
           author_name: Immich Release Bot
@@ -43,7 +42,19 @@ jobs:
           message: "Version ${{ env.IMMICH_VERSION }}"
           tag: ${{ env.IMMICH_VERSION }}
           push: true
+          
+  build_mobile:
+    uses: ./.github/workflows/build-mobile.yml
+    needs: bump_version
+    secrets: inherit
+    with:
+      ref: ${{ needs.bump_version.outputs.ref }}
 
+  prepare_release:
+    runs-on: ubuntu-latest
+    needs: build_mobile
+
+    steps:
       - name: Download APK
         uses: actions/download-artifact@v3
         with: