diff --git a/.github/workflows/voter-team.yml b/.github/workflows/voter-team.yml
index e80c75a..da5e6b1 100644
--- a/.github/workflows/voter-team.yml
+++ b/.github/workflows/voter-team.yml
@@ -24,10 +24,14 @@ jobs:
         with:
           app-id: ${{ vars.APP_ID }}
           private-key: ${{ secrets.PRIVATE_KEY }}
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
       - run: |
-          # https://github.com/actions/create-github-app-token/issues/172
-          git config --global user.name 'nix-elections[bot]'
-          git config --global user.email '181651500+nix-elections[bot]@users.noreply.github.com'
+          git config --global user.name '${{ steps.app-token.outputs.app-slug }}[bot]'
+          git config --global user.email '${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>'
 
       - uses: actions/checkout@v4
         with: