diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage-report.yml
index 1745fcd5..c897d175 100644
--- a/.github/workflows/coverage-report.yml
+++ b/.github/workflows/coverage-report.yml
@@ -31,7 +31,7 @@ jobs:
         env:
           CI: true
       - name: Run test
-        run: yarn test
+        run: yarn test:coverage
 
       - name: Create Coverage Badges
         uses: jaywcjlove/coverage-badges-cli@e07f25709cd25486855c1ba1b26da53576ff3620
diff --git a/.github/workflows/create-pr-to-main.yml b/.github/workflows/create-pr-to-main.yml
deleted file mode 100644
index 790c620c..00000000
--- a/.github/workflows/create-pr-to-main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Create PR to Main
-
-on:
-  release:
-    types:
-      - published
-
-permissions:
-  pull-requests: write
-  contents: read
-
-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 from tag branch to main
-        run: |
-          gh pr create --title "Release ${{ github.event.release.tag_name }}" --body "Release ${{ github.event.release.tag_name }}" --base main --head test --repo ${{ github.repository }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml
new file mode 100644
index 00000000..2692bc1b
--- /dev/null
+++ b/.github/workflows/create-pr.yml
@@ -0,0 +1,15 @@
+name: Create PR
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  create-pr:
+    name: Create PR
+    uses: fingerprintjs/dx-team-toolkit/.github/workflows/create-pr.yml@v1
+    with:
+      target_branch: ${{ github.event.release.prerelease && 'main' || 'test' }}
+      tag_name: ${{ github.event.release.tag_name }}
+      prerelease: ${{ github.event.release.prerelease }}
diff --git a/.releaserc b/.releaserc
index 77ae4c14..b2aa8ef0 100644
--- a/.releaserc
+++ b/.releaserc
@@ -116,6 +116,7 @@
     [
       "@semantic-release/git",
       {
+        "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}",
         "assets": [
           "CHANGELOG.md",
           "package.json"