diff --git a/.github/workflows/close-milestone.yml b/.github/workflows/close-milestone.yml
index 2aa9c52b4b6..ca7dc261a68 100644
--- a/.github/workflows/close-milestone.yml
+++ b/.github/workflows/close-milestone.yml
@@ -11,9 +11,7 @@ on:
         description: Needs to match, exactly, the name of a milestone
         required: true
         type: string
-    secrets:
-      token:
-        required: true
+
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -42,4 +40,4 @@ jobs:
         uses: ./actions/close-milestone
         with:
           version_call: ${{ inputs.version_call }}
-          token: ${{ secrets.token }}
+          token: ${{ steps.generate_token.outputs.token }}
diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml
index 7d1e0da4486..f686dee7d55 100644
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -7,27 +7,13 @@ on:
         required: true
 jobs:
   call-remove-milestone:
-    - name: "Generate token"
-      id: generate_token
-      uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-      with:
-        app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-        private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-    - uses: grafana/grafana/.github/workflows/remove-milestone.yml@main
-      with:
-        version_call: ${{ github.event.inputs.version_input }}
-      secrets:
-        token: ${{ steps.generate_token.outputs.token }}
+    uses: grafana/grafana/.github/workflows/remove-milestone.yml@main
+    with:
+      version_call: ${{ github.event.inputs.version_input }}
+    secrets: inherit
   call-close-milestone:
-    - name: "Generate token"
-      id: generate_token
-      uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-      with:
-        app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-        private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-    - uses: grafana/grafana/.github/workflows/close-milestone.yml@main
-      with:
-        version_call: ${{ github.event.inputs.version_input }}
-      secrets:
-        token: ${{ steps.generate_token.outputs.token }}
-      needs: call-remove-milestone
+    uses: grafana/grafana/.github/workflows/close-milestone.yml@main
+    with:
+      version_call: ${{ github.event.inputs.version_input }}
+    secrets: inherit
+    needs: call-remove-milestone
diff --git a/.github/workflows/remove-milestone.yml b/.github/workflows/remove-milestone.yml
index 0015c34e91d..44f42b5d757 100644
--- a/.github/workflows/remove-milestone.yml
+++ b/.github/workflows/remove-milestone.yml
@@ -11,9 +11,7 @@ on:
         description: Needs to match, exactly, the name of a milestone
         required: true
         type: string
-    secrets:
-      token:
-        required: true
+
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -42,4 +40,4 @@ jobs:
         uses: ./actions/remove-milestone
         with:
           version_call: ${{ inputs.version_call }}
-          token: ${{ secrets.token }}
+          token: ${{ steps.generate_token.outputs.token }}