diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b816821566f1c..763b27160e394 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -786,7 +786,7 @@ jobs:
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
     needs: [prep, android, desktop, ios, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
     with:
-      version: ${{ needs.prep.outputs.APP_VERSION }}${{ github.ref != 'refs/heads/production' && '-staging' || '' }}
+      version: ${{ needs.prep.outputs.APP_VERSION }}
       env: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }}
       android: ${{ needs.android.result }}
       ios: ${{ needs.ios.result }}
diff --git a/.github/workflows/postDeployComments.yml b/.github/workflows/postDeployComments.yml
index a69bd49d4b032..321155453282a 100644
--- a/.github/workflows/postDeployComments.yml
+++ b/.github/workflows/postDeployComments.yml
@@ -100,7 +100,8 @@ jobs:
         id: getPullRequestList
         uses: ./.github/actions/javascript/getDeployPullRequestList
         with:
-          TAG: ${{ inputs.version }}
+          # Staging tags use the `-staging` suffix, production tags use the version only
+          TAG: ${{ inputs.version }}${{ inputs.env == 'staging' && '-staging' || '' }}
           GITHUB_TOKEN: ${{ github.token }}
           IS_PRODUCTION_DEPLOY: ${{ inputs.env == 'production' }}