diff --git a/.github/workflows/create-pr-to-main.yml b/.github/workflows/create-pr-to-main.yml
index 5946c9f4..557f4f64 100644
--- a/.github/workflows/create-pr-to-main.yml
+++ b/.github/workflows/create-pr-to-main.yml
@@ -1,10 +1,10 @@
 name: Create PR to Main
 
 on:
-  workflow_run:
-    workflows: ["Pre-release E2E tests"]
+  release:
     types:
-      - completed
+      - published
+      - prereleased
 
 permissions:
   pull-requests: write
@@ -14,13 +14,16 @@ jobs:
   create-pr-to-main:
     runs-on: ubuntu-latest
     steps:
+      - name: Abort if it's not a pre-release
+        if: github.event.release.prerelease == false
+        run: exit 1
       - name: Checkout test branch
         uses: actions/checkout@v3
         with:
           ref: 'test'
 
-      - name: Create Pull Request
+      - name: Create Pull Request from tag branch to main
         run: |
-          gh pr create --base production --head main --title "Merge test into main" --body "Automated PR to merge test branch into main"
+          gh pr create --title "Release ${{ github.event.release.tag_name }}" --body "Release ${{ github.event.release.tag_name }}" --base main --head ${{ github.event.release.tag_name }} --repo ${{ github.repository }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}