diff --git a/Templates/AppSource App/.github/workflows/TroubleShooting.yaml b/Templates/AppSource App/.github/workflows/TroubleShooting.yaml
index 3623fdca7..2009bfa81 100644
--- a/Templates/AppSource App/.github/workflows/TroubleShooting.yaml	
+++ b/Templates/AppSource App/.github/workflows/TroubleShooting.yaml	
@@ -2,6 +2,11 @@ name: 'Troubleshooting'
 
 on:
   workflow_dispatch:
+    inputs:
+      useLatestTroubleshooting:
+        description: Use the latest troubleshooting action from https://aka.ms/al-go
+        type: boolean
+        default: false
 
 permissions:
   contents: write
@@ -17,6 +22,7 @@ env:
 
 jobs:
   Troubleshooting:
+    if: github.event.inputs.useLatestTroubleshooting == 'false'
     needs: [ ]
     runs-on: [ windows-latest ]
     steps:
@@ -29,3 +35,18 @@ jobs:
         with:
           shell: powershell
           gitHubSecrets: ${{ toJson(secrets) }}
+
+  LatestTroubleshooting:
+    if: github.event.inputs.useLatestTroubleshooting == 'true'
+    needs: [ ]
+    runs-on: [ windows-latest ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Troubleshooting
+        id: init
+        uses: microsoft/AL-Go/Actions/TroubleShooting@main
+        with:
+          shell: powershell
+          gitHubSecrets: ${{ toJson(secrets) }}
diff --git a/Templates/Per Tenant Extension/.github/workflows/TroubleShooting.yaml b/Templates/Per Tenant Extension/.github/workflows/TroubleShooting.yaml
index 3623fdca7..2009bfa81 100644
--- a/Templates/Per Tenant Extension/.github/workflows/TroubleShooting.yaml	
+++ b/Templates/Per Tenant Extension/.github/workflows/TroubleShooting.yaml	
@@ -2,6 +2,11 @@ name: 'Troubleshooting'
 
 on:
   workflow_dispatch:
+    inputs:
+      useLatestTroubleshooting:
+        description: Use the latest troubleshooting action from https://aka.ms/al-go
+        type: boolean
+        default: false
 
 permissions:
   contents: write
@@ -17,6 +22,7 @@ env:
 
 jobs:
   Troubleshooting:
+    if: github.event.inputs.useLatestTroubleshooting == 'false'
     needs: [ ]
     runs-on: [ windows-latest ]
     steps:
@@ -29,3 +35,18 @@ jobs:
         with:
           shell: powershell
           gitHubSecrets: ${{ toJson(secrets) }}
+
+  LatestTroubleshooting:
+    if: github.event.inputs.useLatestTroubleshooting == 'true'
+    needs: [ ]
+    runs-on: [ windows-latest ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Troubleshooting
+        id: init
+        uses: microsoft/AL-Go/Actions/TroubleShooting@main
+        with:
+          shell: powershell
+          gitHubSecrets: ${{ toJson(secrets) }}