diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f5f0d06..f31fea4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,10 +7,10 @@ labels: ['grafana-aws-sdk-react', 'type/bug']
 <!--
 Please use this template to create your bug report. By providing as much info as possible you help us understand the issue, reproduce it and resolve it for you quicker. Therefore, take a couple of extra minutes to make sure you have provided all info needed.
 
-Tip: record your screen and attach it as a gif to showcase the issue.
+PROTIP: record your screen and attach it as a gif to showcase the issue.
 
-- Use query inspector to troubleshoot issues: https://bit.ly/2XNF6YS
-- How to record and attach gif: https://bit.ly/2Mi8T6K
+- Use query inspector to troubleshoot issues: https://community.grafana.com/t/how-to-use-grafanas-query-inspector-to-troubleshoot-issues/2630
+- How to record and attach gif: https://community.grafana.com/t/proptip-record-gif-and-attach-to-bug-report-to-showcase-issue/31320
 -->
 
 **What happened**:
@@ -19,6 +19,15 @@ Tip: record your screen and attach it as a gif to showcase the issue.
 
 **How to reproduce it (as minimally and precisely as possible)**:
 
+<!--
+Example:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+-->
+
 **Screenshots**
 
 <!--
@@ -30,7 +39,7 @@ If applicable, add screenshots to help explain your problem.
 **Environment**:
 
 - Grafana version:
-- Sdk version:
+- SDK version:
 - OS Grafana is installed on:
 - User OS & Browser:
 - Others:
diff --git a/.github/workflows/issue_commands.yml b/.github/workflows/issue_commands.yml
index 134815d..1098219 100644
--- a/.github/workflows/issue_commands.yml
+++ b/.github/workflows/issue_commands.yml
@@ -2,10 +2,12 @@ name: Run commands when issues are labeled
 on:
   issues:
     types: [labeled, unlabeled]
+permissions: {}
 jobs:
   main:
     permissions:
       contents: read
+      id-token: write # The "id-token: write" permission is required by "get-vault-secrets" action
       issues: write
     runs-on: ubuntu-latest
     steps:
@@ -27,10 +29,10 @@ jobs:
             AWS_DS_TOKEN_CREATOR_PEM=aws-ds-token-creator:pem
       - name: 'Generate token'
         id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+        uses: actions/create-github-app-token@v2
         with:
-          app_id: ${{ env.AWS_DS_TOKEN_CREATOR_ID }}
-          private_key: ${{ env.AWS_DS_TOKEN_CREATOR_PEM }}
+          app-id: ${{ env.AWS_DS_TOKEN_CREATOR_ID }}
+          private-key: ${{ env.AWS_DS_TOKEN_CREATOR_PEM }}
       - name: Run Commands
         uses: ./actions/commands
         with: