diff --git a/.github/workflows/build-fdroid-app.yml b/.github/workflows/build-fdroid-app.yml
index 2e387918f98..aad1a3403b1 100644
--- a/.github/workflows/build-fdroid-app.yml
+++ b/.github/workflows/build-fdroid-app.yml
@@ -42,7 +42,7 @@ jobs:
         run: chmod +x ./gradlew
       - name: build prod flavour APK
         run:
-          ./gradlew app:assembleFdroidCompatRelease
+          ./gradlew app:assembleFdroidCompatrelease
         env:
           KEYSTORE_FILE_PATH_DEBUG: ${{ vars.KEYSTORE_FILE_PATH }}
           KEYSTORE_FILE_PATH_RELEASE: ${{ vars.KEYSTORE_FILE_PATH }}
diff --git a/.github/workflows/build-prod-app.yml b/.github/workflows/build-prod-app.yml
index 8bf7a53a7e7..ca956adb68b 100644
--- a/.github/workflows/build-prod-app.yml
+++ b/.github/workflows/build-prod-app.yml
@@ -20,17 +20,11 @@ jobs:
     needs: [ code-analysis, ui-tests, unit-tests ]
     runs-on: ubuntu-latest
     steps:
-      - 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)
-          
-          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."
-            exit 1
-          fi
-
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive # Needed in order to fetch Kalium sources for building
+          fetch-depth: 0
       - name: Get latest release tag
         id: get_latest_release
         run: |
@@ -49,12 +43,6 @@ jobs:
           else
             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:
@@ -72,7 +60,7 @@ jobs:
         run: chmod +x ./gradlew
       - name: build prod flavour APK
         run:
-          ./gradlew app:assembleProdCompatRelease
+          ./gradlew app:assembleProdCompatrelease
         env:
           KEYSTORE_FILE_PATH_DEBUG: ${{ vars.KEYSTORE_FILE_PATH }}
           KEYSTORE_FILE_PATH_RELEASE: ${{ vars.KEYSTORE_FILE_PATH }}
@@ -84,7 +72,7 @@ jobs:
           ENABLE_SIGNING: ${{ secrets.ENABLE_SIGNING }}
       - name: build prod flavour bundle
         run:
-          ./gradlew app:bundleProdCompatRelease
+          ./gradlew app:bundleProdCompatrelease
         env:
           KEYSTORE_FILE_PATH_DEBUG: ${{ vars.KEYSTORE_FILE_PATH }}
           KEYSTORE_FILE_PATH_RELEASE: ${{ vars.KEYSTORE_FILE_PATH }}
@@ -107,7 +95,7 @@ jobs:
         with:
           serviceAccountJson: service_account.json
           packageName: com.wire
-          releaseFiles: app/build/outputs/bundle/prodCompatRelease/*.aab
+          releaseFiles: app/build/outputs/bundle/prodCompatrelease/*.aab
           track: Alpha
       - name: Deploy ProdCompatRelease to S3
         uses: ./.github/actions/deploy-to-s3
@@ -119,6 +107,6 @@ jobs:
           build-flavour: prod
           build-variant: compatrelease
       - name: Attach APK to release
-        uses: softprops/action-gh-release@v2.0.7
+        uses: softprops/action-gh-release@v2.0.8
         with:
-          files: app/build/outputs/apk/prodCompatRelease/*.apk
+          files: app/build/outputs/apk/prodCompatrelease/*.apk