diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml
index aa27b64..deced09 100644
--- a/.github/workflows/nightlybuild.yml
+++ b/.github/workflows/nightlybuild.yml
@@ -5,6 +5,11 @@ on:
   - cron: "30 23 * * *"
   repository_dispatch:
 
+permissions:
+  contents: read
+  issues: write
+
+
 jobs:
   buildnonui:
     name: "Nightly Build - Non UI"
@@ -67,14 +72,20 @@ jobs:
         name: nonuilogs
         path: /home/runner/trace/
 
-    - name: Create Issue on Failed workflow
+    - name: Notify on nightly failure
       if: ${{ failure() }}
-      uses: dacbd/create-issue-action@main
+      uses: TransactionProcessing/org-ci-workflows/.github/actions/nightly-failure-issue@main
       with:
-        token: ${{ github.token }}
-        title: Investigate Nightly Build Failure - Non UI Tests
-        body: Url is ${{env.action_url}}
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        title: Investigate Nightly Build Failure
         labels: nightlybuild
+        dedupe_key: nightlybuild-nonui
+        body: |
+          Repo: ${{ github.repository }}
+          Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          Commit: ${{ github.sha }}
+          Workflow: ${{ github.workflow }}
+          Job: ${{ github.job }}
 
   buildfirefoxui:
     name: "Nightly Build - Firefox UI"
@@ -133,15 +144,22 @@ jobs:
       with:
         name: firefoxlogs
         path: /home/runner/trace/
-    
-    - uses: dacbd/create-issue-action@main
+
+    - name: Notify on nightly failure
       if: ${{ failure() }}
-      name: Create an issue on build failure
+      uses: TransactionProcessing/org-ci-workflows/.github/actions/nightly-failure-issue@main
       with:
-        title: Investigate Nightly Build Failure - Firefox UI
-        token: ${{secrets.GITHUB_TOKEN}}
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        title: Investigate Nightly Build Failure
         labels: nightlybuild
-        body: Url is ${{env.action_url}}
+        dedupe_key: nightlybuild-firefox-ui
+        body: |
+          Repo: ${{ github.repository }}
+          Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          Commit: ${{ github.sha }}
+          Workflow: ${{ github.workflow }}
+          Job: ${{ github.job }}
+    
 
   buildchromeui:
     name: "Nightly Build - Chrome UI"
@@ -205,15 +223,22 @@ jobs:
       with:
         name: chromelogs
         path: /home/runner/trace/
-        
-    - uses: dacbd/create-issue-action@main
+
+    - name: Notify on nightly failure
       if: ${{ failure() }}
-      name: Create an issue on build failure
+      uses: TransactionProcessing/org-ci-workflows/.github/actions/nightly-failure-issue@main
       with:
-        title: Investigate Nightly Build Failure - Chrome UI
-        token: ${{secrets.GITHUB_TOKEN}}
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        title: Investigate Nightly Build Failure
         labels: nightlybuild
-        body: Url is ${{env.action_url}}
+        dedupe_key: nightlybuild-chrome-ui
+        body: |
+          Repo: ${{ github.repository }}
+          Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          Commit: ${{ github.sha }}
+          Workflow: ${{ github.workflow }}
+          Job: ${{ github.job }}
+        
 
   buildedgeui:
     name: "Nightly Build - Edge UI"
@@ -275,11 +300,18 @@ jobs:
         name: edgelogs
         path: /home/runner/trace/
 
-    - uses: dacbd/create-issue-action@main
+    - name: Notify on nightly failure
       if: ${{ failure() }}
-      name: Create an issue on build failure
+      uses: TransactionProcessing/org-ci-workflows/.github/actions/nightly-failure-issue@main
       with:
-        title: Investigate Nightly Build Failure - Edge UI
-        token: ${{secrets.GITHUB_TOKEN}}
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        title: Investigate Nightly Build Failure
         labels: nightlybuild
-        body: Url is ${{env.action_url}}    
+        dedupe_key: nightlybuild-edge-ui
+        body: |
+          Repo: ${{ github.repository }}
+          Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          Commit: ${{ github.sha }}
+          Workflow: ${{ github.workflow }}
+          Job: ${{ github.job }}
+