diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index 7a704fd3..b062c0a0 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -208,10 +208,10 @@ jobs:
         run: npm -v
       - name: Install Dependencies
         run: npm i --ignore-scripts --no-audit --no-fund
-      - name: Add Problem Matcher
-        run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Set Tap RC
         run: node ./test/fixtures/taprc.js
+      - name: Add Problem Matcher
+        run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
         run: npm test --ignore-scripts
       - name: Conclude Check
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 17ccceba..dc3cf2e8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,9 +106,9 @@ jobs:
         run: npm -v
       - name: Install Dependencies
         run: npm i --ignore-scripts --no-audit --no-fund
-      - name: Add Problem Matcher
-        run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Set Tap RC
         run: node ./test/fixtures/taprc.js
+      - name: Add Problem Matcher
+        run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
         run: npm test --ignore-scripts
diff --git a/scripts/template-oss/_step-git.yml b/scripts/template-oss/_step-git.yml
index 1f42494d..329bf5bb 100644
--- a/scripts/template-oss/_step-git.yml
+++ b/scripts/template-oss/_step-git.yml
@@ -1,15 +1,4 @@
 - name: Support Long Paths
   if: matrix.platform.os == 'windows-latest'
   run: git config --system core.longpaths true
-- name: Checkout
-  uses: actions/checkout@v3
-  {{#if jobCheckout}}
-  with:
-  {{#each jobCheckout}}
-    {{ @key }}: {{ this }}
-  {{/each}}
-  {{/if}}
-- name: Setup Git User
-  run: |
-    git config --global user.email "npm-cli+bot@github.com"
-    git config --global user.name "npm CLI robot"
+{{> defaultStepGit }}
diff --git a/scripts/template-oss/_step-test.yml b/scripts/template-oss/_step-test.yml
index ff34d24d..84b6d549 100644
--- a/scripts/template-oss/_step-test.yml
+++ b/scripts/template-oss/_step-test.yml
@@ -1,6 +1,3 @@
-- name: Add Problem Matcher
-  run: echo "::add-matcher::.github/matchers/tap.json"
 - name: Set Tap RC
   run: node ./test/fixtures/taprc.js
-- name: Test
-  run: {{ rootNpmPath }} test --ignore-scripts
+{{> defaultStepTest }}