diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index 7f48d351..1e35e279 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -15,8 +15,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 287a8696..eda41a7b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,8 +22,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -59,8 +59,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0067fc1b..2fbb6309 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -34,8 +34,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
diff --git a/.github/workflows/post-dependabot.yml b/.github/workflows/post-dependabot.yml
index 4dd83131..94f5a8fd 100644
--- a/.github/workflows/post-dependabot.yml
+++ b/.github/workflows/post-dependabot.yml
@@ -16,8 +16,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index bf86a7da..d2bc7dab 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -20,8 +20,8 @@ jobs:
           fetch-depth: 0
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
diff --git a/lib/content/setup-git.yml b/lib/content/setup-git.yml
index 8c148e97..1d75ab7e 100644
--- a/lib/content/setup-git.yml
+++ b/lib/content/setup-git.yml
@@ -7,5 +7,5 @@
 {{/if}}
 - name: Setup git user
   run: |
-    git config --global user.email "npm team"
-    git config --global user.name "ops+robot@npmjs.com"
+    git config --global user.email "ops+robot@npmjs.com"
+    git config --global user.name "npm team"
diff --git a/tap-snapshots/test/apply/full-content.js.test.cjs b/tap-snapshots/test/apply/full-content.js.test.cjs
index 5eb207e2..a0fc34cb 100644
--- a/tap-snapshots/test/apply/full-content.js.test.cjs
+++ b/tap-snapshots/test/apply/full-content.js.test.cjs
@@ -145,8 +145,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -182,8 +182,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -219,8 +219,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node-version }}
@@ -283,8 +283,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
@@ -312,8 +312,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -362,8 +362,8 @@ jobs:
           fetch-depth: 0
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -623,8 +623,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -664,8 +664,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -701,8 +701,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node-version }}
@@ -757,8 +757,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -794,8 +794,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node-version }}
@@ -846,8 +846,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -883,8 +883,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node-version }}
@@ -947,8 +947,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
@@ -976,8 +976,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -1026,8 +1026,8 @@ jobs:
           fetch-depth: 0
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -1085,8 +1085,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -1148,8 +1148,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup git user
         run: |
-          git config --global user.email "npm team"
-          git config --global user.name "ops+robot@npmjs.com"
+          git config --global user.email "ops+robot@npmjs.com"
+          git config --global user.name "npm team"
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
diff --git a/tap-snapshots/test/check/diffs.js.test.cjs b/tap-snapshots/test/check/diffs.js.test.cjs
index d834a2d8..6e235a58 100644
--- a/tap-snapshots/test/check/diffs.js.test.cjs
+++ b/tap-snapshots/test/check/diffs.js.test.cjs
@@ -311,7 +311,7 @@ The repo file ci.yml needs to be updated:
   .github/workflows/ci.yml
   ========================================
   @@ -63,4 +63,24 @@
-             git config --global user.name "ops+robot@npmjs.com"
+             git config --global user.name "npm team"
          - uses: actions/setup-node@v3
            with:
              node-version: \${{ matrix.node-version }}
@@ -365,8 +365,8 @@ The repo file audit.yml needs to be updated:
         - uses: actions/checkout@v3
         - name: Setup git user
           run: |
-            git config --global user.email "npm team"
-            git config --global user.name "ops+robot@npmjs.com"
+            git config --global user.email "ops+robot@npmjs.com"
+            git config --global user.name "npm team"
         - uses: actions/setup-node@v3
           with:
             node-version: 16.x