diff --git a/.github/pr-commenter.yml b/.github/pr-commenter.yml
index 7ff471048f..f2a6876e7f 100644
--- a/.github/pr-commenter.yml
+++ b/.github/pr-commenter.yml
@@ -2,7 +2,7 @@ comment:
   on-update: recreate
 
   snippets:
-    - id: advertise_build_url_{{url}}
+    - id: advertise_build_url_{{ build_id }}
       body: |
         {{#url}}An experimental build of WeakAuras with the changes in this pull request is available [here](${{url}}).{{/url}}
         {{^url}}Experimental build was unsuccessful. See the logs for details.{{/url}}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 79b8cc3d68..7d5f2a5b7e 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -49,6 +49,7 @@ jobs:
           config-file: ".github/pr-commenter.yml"
           template-variables: |
             {
+              "build_id": "${{ steps.upload-artifact.outputs.artifact-id }}",
               "url": "${{ steps.upload-artifact.conclusion == 'success' && steps.upload-artifact.outputs.artifact-url }}"
             }