diff --git a/.github/workflows/gh-release-drafter.yml b/.github/workflows/gh-release-drafter.yml
index c6e4106fa..a74b65d3c 100644
--- a/.github/workflows/gh-release-drafter.yml
+++ b/.github/workflows/gh-release-drafter.yml
@@ -110,6 +110,6 @@ jobs:
             ## :octocat: GitHub Release
             This pull request resulted in the release: [v${{ steps.check.outputs.version }} @ ${{ env.ref }}](${{ steps.release-drafter.outputs.html_url }})
 
-            _Comment generated by the [${{ github.workflow }}](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}) workflow._
+            _Comment generated by the [${{ github.workflow }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}) workflow._
           comment_tag: gh-release
           pr_number: ${{ steps.pr-finder.outputs.PR_NUMBER }}
diff --git a/.github/workflows/node-publish.yml b/.github/workflows/node-publish.yml
index a1ad34c35..c846c4d6b 100644
--- a/.github/workflows/node-publish.yml
+++ b/.github/workflows/node-publish.yml
@@ -55,6 +55,6 @@ jobs:
             ## :package: npm Publish
             This pull request resulted in the npm release: [v${{ steps.publish.outputs.PACKAGE_VERSION }}](https://www.npmjs.com/package/${{ steps.publish.outputs.PACKAGE_NAME }}/v/${{ steps.publish.outputs.PACKAGE_VERSION }})
 
-            _Comment generated by the [${{ github.workflow }}](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}) workflow._
+            _Comment generated by the [${{ github.workflow }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}) workflow._
           comment_tag: node-publish
           pr_number: ${{ steps.pr-finder.outputs.PR_NUMBER }}
diff --git a/.github/workflows/pr-commenter.yml b/.github/workflows/pr-commenter.yml
index ac655c45e..6b3063cc3 100644
--- a/.github/workflows/pr-commenter.yml
+++ b/.github/workflows/pr-commenter.yml
@@ -43,5 +43,5 @@ jobs:
             ```shell
             npm exec --yes -- "github:${{ github.event.pull_request.head.repo.full_name }}#${{ github.event.pull_request.head.ref }}" [commands..] [options]
             ```
-            _Comment generated by the [${{ github.workflow }}](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}) workflow._
+            _Comment generated by the [${{ github.workflow }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}) workflow._
           comment_tag: npm-exec
diff --git a/.github/workflows/pr-renamer.yml b/.github/workflows/pr-renamer.yml
index 17545acd3..b4181b41d 100644
--- a/.github/workflows/pr-renamer.yml
+++ b/.github/workflows/pr-renamer.yml
@@ -9,6 +9,10 @@ on:
       - reopened
       - synchronize  # PR's branch was edited (i.e. new commits)
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   rename:
     permissions:
@@ -85,7 +89,7 @@ jobs:
             ```text
             ${{ steps.title-massager.outputs.ERROR }}
             ```
-            _Comment generated by the [${{ github.workflow }}](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}) workflow._
+            _Comment generated by the [${{ github.workflow }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}) workflow._
           mode: ${{ steps.gh-pr-edit.outcome != 'success' && 'upsert' || 'delete' }}
           create_if_not_exists: ${{ steps.gh-pr-edit.outcome != 'success' && 'true' || 'false' }}
           comment_tag: pr-renamer