diff --git a/.github/actions/checkout-as-app/action.yml b/.github/actions/checkout-as-app/action.yml
index 8138b17..dcd77de 100644
--- a/.github/actions/checkout-as-app/action.yml
+++ b/.github/actions/checkout-as-app/action.yml
@@ -161,3 +161,9 @@ runs:
         set-safe-directory: ${{ inputs.set-safe-directory }}
         github-server-url: ${{ inputs.github-server-url }}
         persist-credentials: ${{ inputs.persist-credentials }}
+
+    - name: Configure local git user
+      shell: bash
+      run: |
+        git config user.name '${{ steps.auth.outputs.user-name }}'
+        git config user.email '${{ steps.auth.outputs.user-email }}'
diff --git a/.github/actions/github-app-auth/action.yml b/.github/actions/github-app-auth/action.yml
index 6df8390..eba0889 100644
--- a/.github/actions/github-app-auth/action.yml
+++ b/.github/actions/github-app-auth/action.yml
@@ -80,9 +80,7 @@ runs:
         echo "GITHUB_TOKEN=${GH_TOKEN}" >> $GITHUB_ENV
         echo "Wrote GITHUB_TOKEN to GITHUB_ENV"
         git config --global user.name '${{ steps.get-user-id.outputs.user-name }}'
-        git config user.name '${{ steps.get-user-id.outputs.user-name }}'
         git config --global user.email '${{ steps.get-user-id.outputs.user-email }}'
-        git config user.email '${{ steps.get-user-id.outputs.user-email }}'
 
     - name: Output GitHub App authentication info
       shell: bash
@@ -101,3 +99,10 @@ runs:
         token: ${{ steps.app-token.outputs.token }}
         clean: false
         persist-credentials: true
+
+    - name: Configure local git user
+      if: inputs.skip-checkout != 'true'
+      shell: bash
+      run: |
+        git config user.name '${{ steps.get-user-id.outputs.user-name }}'
+        git config user.email '${{ steps.get-user-id.outputs.user-email }}'