diff --git a/.github/workflows/build-prod-app.yml b/.github/workflows/build-prod-app.yml
index 8bf7a53a7e7..07d7445a9c4 100644
--- a/.github/workflows/build-prod-app.yml
+++ b/.github/workflows/build-prod-app.yml
@@ -20,11 +20,17 @@ jobs:
     needs: [ code-analysis, ui-tests, unit-tests ]
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive # Needed in order to fetch Kalium sources for building
+          fetch-depth: 0
+
       - name: Verify release target commit
         id: verify_commit
         run: |
-          release_commit=$(git rev-parse ${{ github.event.release.target_commitish }})
-          prod_commit=$(git rev-parse refs/heads/prod)
+          release_commit=$(git rev-parse --short "$GITHUB_SHA")
+          prod_commit=$(git rev-parse --short refs/heads/prod)
           
           if [[ "$release_commit" != "$prod_commit" ]]; then
             echo "Error: The commit associated with the release tag is not the same as the HEAD of the prod branch."
@@ -50,11 +56,6 @@ jobs:
             echo "Current tag ($current_tag) is equal or higher than latest tag ($latest_tag). Continuing the workflow."
           fi
 
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive # Needed in order to fetch Kalium sources for building
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: buildjet/setup-java@v4
         with: