diff --git a/.github/workflows/release-pocket-ios.yml b/.github/workflows/release-pocket-ios.yml
index b1d3715a1..09c17fc00 100644
--- a/.github/workflows/release-pocket-ios.yml
+++ b/.github/workflows/release-pocket-ios.yml
@@ -10,20 +10,15 @@ on:
       - prereleased
   workflow_dispatch:
     inputs:
-      no_release_upload:
-        description: No GitHub release upload
-        required: false
-        default: false
+      testflight:
+        description: Upload to TestFlight
         type: boolean
-      no_testflight_upload:
-        description: No TestFlight upload
-        required: false
         default: false
-        type: boolean
-      release_upload_tag:
-        description: GitHub release upload tag
-        required: false
+      tag:
+        description: GitHub Release tag (empty to skip)
         type: string
+        required: false
+        default: ''
 
 jobs:
   build:
@@ -32,6 +27,8 @@ jobs:
     env:
       PRODUCT_NAME: 'AIRI'
       VITE_ENABLE_POSTHOG: 'true'
+      UPLOAD_TESTFLIGHT: ${{ github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.testflight) }}
+      RELEASE_TAG: ${{ github.event.release.tag_name || inputs.tag }}
     steps:
       - uses: actions/checkout@v6
 
@@ -128,14 +125,14 @@ jobs:
           if-no-files-found: error
 
       - name: Install Transporter
-        if: ${{ github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && !inputs.no_testflight_upload) }}
+        if: ${{ env.UPLOAD_TESTFLIGHT == 'true' }}
         run: |
           curl -fsSL "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/ra/resources/download/public/Transporter__OSX/bin/" -o "$RUNNER_TEMP/itmstransporter.pkg"
           sudo installer -pkg "$RUNNER_TEMP/itmstransporter.pkg" -target /
           rm -f "$RUNNER_TEMP/itmstransporter.pkg"
 
       - name: Upload to TestFlight
-        if: ${{ github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && !inputs.no_testflight_upload) }}
+        if: ${{ env.UPLOAD_TESTFLIGHT == 'true' }}
         uses: apple-actions/upload-testflight-build@v4
         with:
           app-path: ${{ runner.temp }}/output/${{ env.IPA_NAME }}
@@ -144,12 +141,13 @@ jobs:
           api-private-key: ${{ secrets.APPSTORE_CONNECT_API_KEY }}
 
       - name: Upload to GitHub Releases
-        if: ${{ github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && !inputs.no_release_upload) }}
+        if: ${{ env.RELEASE_TAG != '' }}
         uses: softprops/action-gh-release@v2
         with:
           files: ${{ runner.temp }}/output/${{ env.IPA_NAME }}
           append_body: true
-          tag_name: ${{ github.event.release.tag_name || inputs.release_upload_tag }}
+          fail_on_unmatched_files: true
+          tag_name: ${{ env.RELEASE_TAG }}
 
       - name: Clean up signing
         if: always()