diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 15988f361..c2fbd19c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -116,6 +116,17 @@ jobs:
         with:
           name: v${{ steps.nbgv.outputs.SemVer2 }}
           tag_name: v${{ steps.nbgv.outputs.SemVer2 }}
-          token: ${{ secrets.RELEASE_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           generate_release_notes: true
+      - name: Wait for GitHub release to be available
+        run: sleep 30s
+        shell: bash
+      - name: Comment on relevant PRs and issues
+        uses: apexskier/github-release-commenter@v1.2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          comment-template: |
+            This is addressed in release {release_link}.
+          label-template: |
+            state: released
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 05d13e803..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Release
-on:
-  release:
-    types: [published]
-
-jobs:
-  release:
-    name: Comment on relevant PRs and issues
-    runs-on: ubuntu-latest
-    steps:
-      - uses: apexskier/github-release-commenter@v1.2
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          comment-template: |
-            This is addressed in release {release_link}.
-          label-template: |
-            state: released