diff --git a/.github/workflows/olm.yml b/.github/workflows/olm.yml
index 8e92fa01..7296b5a3 100644
--- a/.github/workflows/olm.yml
+++ b/.github/workflows/olm.yml
@@ -221,7 +221,7 @@ jobs:
       name: Create branch for Openshift Marketplace PR
       runs-on: ubuntu-latest
       needs: test-olm-package
-      if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+      if: ${{ github.event_name == 'release' || inputs.release == true }}
       steps:
         - name: Checkout community-operators-prod fork (Openshift Ecosystem)
           uses: actions/checkout@v5
@@ -239,6 +239,8 @@ jobs:
         - name: Create branch for Openshift Ecosystem PR
           env:
             BUNDLE_VERSION: ${{ needs.test-olm-package.outputs.olm_package_version }}
+            GH_PROMPT_DISABLED: 1
+            GH_TOKEN: ${{ secrets.RABBITMQ_CI_TOKEN }}
           run: |
             git config user.name "rabbitmq-ci"
             git config user.email ${{ secrets.RABBITMQ_CI_EMAIL }}