diff --git a/.github/workflows/combine.yml b/.github/workflows/combine.yml
index dc5297835..035daa0a4 100644
--- a/.github/workflows/combine.yml
+++ b/.github/workflows/combine.yml
@@ -30,10 +30,16 @@ jobs:
       - name: foundry-install
         uses: foundry-rs/foundry-toolchain@v1
 
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api /users/${{ steps.generate-token.outputs.app-slug }}[bot] --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+
       - name: Configure Git for Hyper Gonk
         run: |
           git config user.name "${{ steps.generate-token.outputs.app-slug }}[bot]"
-          git config user.email "${{ secrets.HYPER_GONK_APP_ID }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
+          git config user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
 
       - name: combine-data
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fdb8616a3..2a1df5b83 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,10 +36,16 @@ jobs:
           app-id: ${{ secrets.HYPER_GONK_APP_ID }}
           private-key: ${{ secrets.HYPER_GONK_PRIVATE_KEY }}
 
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api /users/${{ steps.generate-token.outputs.app-slug }}[bot] --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+
       - name: Configure Git for Hyper Gonk
         run: |
           git config user.name "${{ steps.generate-token.outputs.app-slug }}[bot]"
-          git config user.email "${{ secrets.HYPER_GONK_APP_ID }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
+          git config user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
 
       - name: Create Release PR or Publish to NPM
         id: changesets
diff --git a/.github/workflows/update-hyperlane-deps.yml b/.github/workflows/update-hyperlane-deps.yml
index ca7ca1475..6ae6bbf82 100644
--- a/.github/workflows/update-hyperlane-deps.yml
+++ b/.github/workflows/update-hyperlane-deps.yml
@@ -27,10 +27,16 @@ jobs:
           ref: main
           token: ${{ steps.generate-token.outputs.token }}
 
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api /users/${{ steps.generate-token.outputs.app-slug }}[bot] --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+
       - name: Configure Git
         run: |
           git config user.name "${{ steps.generate-token.outputs.app-slug }}[bot]"
-          git config user.email "${{ secrets.HYPER_GONK_APP_ID }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
+          git config user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
 
       - name: Setup Node.js 20
         uses: actions/setup-node@v4