diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index deef8fcd7..a40b573d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.CZI_RELEASE_PLEASE_APP_ID }}
           private_key: ${{ secrets.CZI_RELEASE_PLEASE_PK }}
diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml
index f40ece613..63a4024a5 100644
--- a/.github/workflows/dependabot_automerge.yml
+++ b/.github/workflows/dependabot_automerge.yml
@@ -1,5 +1,5 @@
 name: Dependabot auto-approve
-on: 
+on:
   pull_request: {}
 
 permissions:
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.CZI_GITHUB_HELPER_APP_ID }}
           private_key: ${{ secrets.CZI_GITHUB_HELPER_PK }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3d32c7ca0..ec78a558c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       # For why we need to generate a token and not use the default
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.CZI_RELEASE_PLEASE_APP_ID }}
           private_key: ${{ secrets.CZI_RELEASE_PLEASE_PK }}
diff --git a/templates/templates/.github/workflows/fogg_ci.yml.tmpl b/templates/templates/.github/workflows/fogg_ci.yml.tmpl
index 9e9f65816..2a9f1e1f2 100644
--- a/templates/templates/.github/workflows/fogg_ci.yml.tmpl
+++ b/templates/templates/.github/workflows/fogg_ci.yml.tmpl
@@ -2,7 +2,7 @@
 # Make improvements in fogg, so that everyone can benefit.
 {{- $githubActionsCI := . }}
 
-on: 
+on:
   push:
   merge_group:
 
@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: {{`${{ secrets.CZI_GITHUB_HELPER_APP_ID }}`}}
           private_key: {{`${{ secrets.CZI_GITHUB_HELPER_PK }}`}}
@@ -35,7 +35,7 @@ jobs:
         with:
           path: ~/.fogg/cache
           key: fogg-cache-{{`${{ hashFiles('**/.fogg-version') }}`}}
-      - run: make setup      
+      - run: make setup
       - run: |
           mkdir -p ~/.ssh/
           ssh-keyscan -H github.com >> ~/.ssh/known_hosts
@@ -109,7 +109,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: {{`${{ secrets.CZI_GITHUB_HELPER_APP_ID }}`}}
           private_key: {{`${{ secrets.CZI_GITHUB_HELPER_PK }}`}}
diff --git a/testdata/github_actions/.github/workflows/fogg_ci.yml b/testdata/github_actions/.github/workflows/fogg_ci.yml
index 188bdb2d9..a69538f42 100644
--- a/testdata/github_actions/.github/workflows/fogg_ci.yml
+++ b/testdata/github_actions/.github/workflows/fogg_ci.yml
@@ -1,7 +1,7 @@
 # Auto-generated by fogg. Do not edit
 # Make improvements in fogg, so that everyone can benefit.
 
-on: 
+on:
   push:
   merge_group:
 
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.CZI_GITHUB_HELPER_APP_ID }}
           private_key: ${{ secrets.CZI_GITHUB_HELPER_PK }}
@@ -27,7 +27,7 @@ jobs:
         with:
           path: ~/.fogg/cache
           key: fogg-cache-${{ hashFiles('**/.fogg-version') }}
-      - run: make setup      
+      - run: make setup
       - run: |
           mkdir -p ~/.ssh/
           ssh-keyscan -H github.com >> ~/.ssh/known_hosts
@@ -79,7 +79,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.CZI_GITHUB_HELPER_APP_ID }}
           private_key: ${{ secrets.CZI_GITHUB_HELPER_PK }}
diff --git a/testdata/v2_full_yaml/.github/workflows/fogg_ci.yml b/testdata/v2_full_yaml/.github/workflows/fogg_ci.yml
index 97182fb06..0ec982341 100644
--- a/testdata/v2_full_yaml/.github/workflows/fogg_ci.yml
+++ b/testdata/v2_full_yaml/.github/workflows/fogg_ci.yml
@@ -1,7 +1,7 @@
 # Auto-generated by fogg. Do not edit
 # Make improvements in fogg, so that everyone can benefit.
 
-on: 
+on:
   push:
   merge_group:
 
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.CZI_GITHUB_HELPER_APP_ID }}
           private_key: ${{ secrets.CZI_GITHUB_HELPER_PK }}
@@ -27,7 +27,7 @@ jobs:
         with:
           path: ~/.fogg/cache
           key: fogg-cache-${{ hashFiles('**/.fogg-version') }}
-      - run: make setup      
+      - run: make setup
       - run: |
           mkdir -p ~/.ssh/
           ssh-keyscan -H github.com >> ~/.ssh/known_hosts
@@ -37,7 +37,7 @@ jobs:
           ssh-private-key: |
             ${{ secrets.SHARED_INFRA_DEPLOY_KEY }}
             ${{ secrets.SHARED_INFRA_DEPLOY_KEY2 }}
-            
+
       - run: .fogg/bin/fogg apply
       - uses: EndBug/add-and-commit@v9
         with:
@@ -84,7 +84,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: chanzuckerberg/github-app-token@v1.1.4
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.CZI_GITHUB_HELPER_APP_ID }}
           private_key: ${{ secrets.CZI_GITHUB_HELPER_PK }}