diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index e03ac191ae6d3..cb12bc3e5c269 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -33,8 +33,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js --package-lock
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Run Production Audit
         run: node . audit --omit=dev
       - name: Run Full Audit
diff --git a/.github/workflows/ci-libnpmaccess.yml b/.github/workflows/ci-libnpmaccess.yml
index 3a6662ea109c0..0f530a4cddaca 100644
--- a/.github/workflows/ci-libnpmaccess.yml
+++ b/.github/workflows/ci-libnpmaccess.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmaccess
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmdiff.yml b/.github/workflows/ci-libnpmdiff.yml
index 60a25248dfaca..6171ebdfd26f4 100644
--- a/.github/workflows/ci-libnpmdiff.yml
+++ b/.github/workflows/ci-libnpmdiff.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmdiff
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmexec.yml b/.github/workflows/ci-libnpmexec.yml
index 0eebbb4bb4175..e216f74c4a54f 100644
--- a/.github/workflows/ci-libnpmexec.yml
+++ b/.github/workflows/ci-libnpmexec.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmexec
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmfund.yml b/.github/workflows/ci-libnpmfund.yml
index 0e6514696443e..e1daa28bd270a 100644
--- a/.github/workflows/ci-libnpmfund.yml
+++ b/.github/workflows/ci-libnpmfund.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmfund
       - name: Post Lint
@@ -93,8 +91,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmhook.yml b/.github/workflows/ci-libnpmhook.yml
index 6e0d09081c851..d384f7127b103 100644
--- a/.github/workflows/ci-libnpmhook.yml
+++ b/.github/workflows/ci-libnpmhook.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmhook
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmorg.yml b/.github/workflows/ci-libnpmorg.yml
index 0ba1bccd40b87..2860ad34c145e 100644
--- a/.github/workflows/ci-libnpmorg.yml
+++ b/.github/workflows/ci-libnpmorg.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmorg
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmpack.yml b/.github/workflows/ci-libnpmpack.yml
index 46326e61f8b49..bf5471e58c941 100644
--- a/.github/workflows/ci-libnpmpack.yml
+++ b/.github/workflows/ci-libnpmpack.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmpack
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmpublish.yml b/.github/workflows/ci-libnpmpublish.yml
index 43922b5eb3d79..33a21ef83735d 100644
--- a/.github/workflows/ci-libnpmpublish.yml
+++ b/.github/workflows/ci-libnpmpublish.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmpublish
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmsearch.yml b/.github/workflows/ci-libnpmsearch.yml
index bc29c37d15d03..58d58b523ad4a 100644
--- a/.github/workflows/ci-libnpmsearch.yml
+++ b/.github/workflows/ci-libnpmsearch.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmsearch
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmteam.yml b/.github/workflows/ci-libnpmteam.yml
index 7aef5bd823260..c1dc3219c5cbd 100644
--- a/.github/workflows/ci-libnpmteam.yml
+++ b/.github/workflows/ci-libnpmteam.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmteam
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-libnpmversion.yml b/.github/workflows/ci-libnpmversion.yml
index 1bd8f2c6b357a..f78a1df3acc5b 100644
--- a/.github/workflows/ci-libnpmversion.yml
+++ b/.github/workflows/ci-libnpmversion.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w libnpmversion
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-npmcli-arborist.yml b/.github/workflows/ci-npmcli-arborist.yml
index 4618dece5df77..7ba0f170e576d 100644
--- a/.github/workflows/ci-npmcli-arborist.yml
+++ b/.github/workflows/ci-npmcli-arborist.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w @npmcli/arborist
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-npmcli-config.yml b/.github/workflows/ci-npmcli-config.yml
index 041674ece4bfa..0aa7e07b2f229 100644
--- a/.github/workflows/ci-npmcli-config.yml
+++ b/.github/workflows/ci-npmcli-config.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w @npmcli/config
       - name: Post Lint
@@ -93,8 +91,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-npmcli-docs.yml b/.github/workflows/ci-npmcli-docs.yml
index f93245c04ef70..ad6cabf1932a4 100644
--- a/.github/workflows/ci-npmcli-docs.yml
+++ b/.github/workflows/ci-npmcli-docs.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w @npmcli/docs
       - name: Post Lint
@@ -88,8 +86,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
@@ -123,8 +119,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Build Docs
         run: |
           node . run build -w docs
diff --git a/.github/workflows/ci-npmcli-mock-globals.yml b/.github/workflows/ci-npmcli-mock-globals.yml
index aa275662780ac..a56a026613bfe 100644
--- a/.github/workflows/ci-npmcli-mock-globals.yml
+++ b/.github/workflows/ci-npmcli-mock-globals.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w @npmcli/mock-globals
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-npmcli-mock-registry.yml b/.github/workflows/ci-npmcli-mock-registry.yml
index e368025402432..8e23df0cb5657 100644
--- a/.github/workflows/ci-npmcli-mock-registry.yml
+++ b/.github/workflows/ci-npmcli-mock-registry.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w @npmcli/mock-registry
       - name: Post Lint
@@ -91,8 +89,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-npmcli-smoke-tests.yml b/.github/workflows/ci-npmcli-smoke-tests.yml
index b0c31b9e88ae3..abb434b23fa79 100644
--- a/.github/workflows/ci-npmcli-smoke-tests.yml
+++ b/.github/workflows/ci-npmcli-smoke-tests.yml
@@ -42,8 +42,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -w @npmcli/smoke-tests
       - name: Post Lint
@@ -93,8 +91,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index df410a7108c1a..7a224177fe5d6 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -88,8 +88,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts -ws -iwr --if-present
       - name: Post Lint
@@ -189,8 +187,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
@@ -293,8 +289,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Pack
         env:
           SMOKE_PUBLISH_NPM: 1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58763654ba144..7ad326099c57b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,8 +50,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Lint
         run: node . run lint --ignore-scripts
       - name: Post Lint
@@ -99,8 +97,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
@@ -132,8 +128,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Check Licenses
         run: node . run licenses
 
@@ -161,8 +155,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Run Smoke Tests
         run: node . test -w smoke-tests --ignore-scripts
       - name: Check Git Status
@@ -191,8 +183,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Setup WSL
         uses: Vampire/setup-wsl@v2.0.1
       - name: Setup Cygwin
diff --git a/.github/workflows/create-node-pr.yml b/.github/workflows/create-node-pr.yml
index 4f867518cec82..b772ff2706bc1 100644
--- a/.github/workflows/create-node-pr.yml
+++ b/.github/workflows/create-node-pr.yml
@@ -43,8 +43,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Checkout Node
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index bb2b544a2c568..f28d52cc09046 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -37,8 +37,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Run Commitlint on Commits
         id: commit
         continue-on-error: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac547956674fe..7bdfb8d30fa59 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -51,8 +51,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Release Please
         id: release
         env:
@@ -166,8 +164,6 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Reset Deps
         run: node scripts/resetdeps.js
-      - name: Check Git Status
-        run: node scripts/git-dirty.js
       - name: Run Post Pull Request Actions
         env:
           RELEASE_PR_NUMBER: ${{ needs.release.outputs.pr-number }}
diff --git a/scripts/template-oss/_step-deps.yml b/scripts/template-oss/_step-deps.yml
index d83726613ec76..c36f9a2f2fb8a 100644
--- a/scripts/template-oss/_step-deps.yml
+++ b/scripts/template-oss/_step-deps.yml
@@ -2,5 +2,3 @@
   run: node scripts/git-dirty.js
 - name: Reset Deps
   run: node scripts/resetdeps.js {{~#if jobDepFlags}} {{ jobDepFlags }}{{/if}}
-- name: Check Git Status
-  run: node scripts/git-dirty.js