diff --git a/.github/pr-commenter.yml b/.github/pr-commenter.yml
index 77c41de0ca..861fde4a99 100644
--- a/.github/pr-commenter.yml
+++ b/.github/pr-commenter.yml
@@ -8,5 +8,5 @@ comment:
       glob-options:
         dot: true
       body: |
-        {{#url}}An experimental build of WeakAuras with the changes in this pull request is available ${{url}}.{{/url}}
-        {{^url}}Experimental build was unsuccessful. See the logs for details.{{/url}}
+        {{#build_id}}An experimental build of WeakAuras with the changes in this pull request is available [here](https://github.com/${{repository}/actions/runs/{{run_id}}/artifacts/{{build_id}}).{{/build_id}}
+        {{^build_id}}Experimental build was unsuccessful. See the logs for details.{{/build_id}}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index f09cac2856..ca3131c603 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -49,8 +49,9 @@ jobs:
           config-file: ".github/pr-commenter.yml"
           template-variables: |
             {
+              "repository": "${{ github.repository }}",
               "build_id": "${{ steps.upload-artifact.outputs.artifact-id }}",
-              "url": "${{ steps.upload-artifact.conclusion == 'success' && steps.upload-artifact.outputs.artifact-url }}"
+              "run_id": "${{ github.run_id }}",
             }
 
       - name: Send Status to Discord