diff --git a/.github/templates/nightly-issue-template.md b/.github/templates/nightly-issue-template.md
index 2a7e1321d8..96750ef2f5 100644
--- a/.github/templates/nightly-issue-template.md
+++ b/.github/templates/nightly-issue-template.md
@@ -3,4 +3,4 @@ title: Nightly failure {{ date | date('dddd, MMMM Do YYYY, h:mm:ss a') }}
 labels: bug, nightly
 ---
 
-Nightly build failure on {{ tools.context.sha }}
+Nightly build failure on {{ env.RUN_URL }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 63ddc48dc2..6e9b342c57 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -19,11 +19,12 @@ jobs:
       issues: write
     needs: [ build ]
     # only create an issue if it failed in a scheduled run
-    if: github.event_name == "schedule" && failure()
+    if: github.event_name == 'schedule' && failure()
     steps:
       - uses: actions/checkout@v3
       - uses: JasonEtco/create-an-issue@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} 
         with:
           filename: .github/templates/nightly-issue-template.md