diff --git a/.github/matchers/tap.json b/.github/matchers/tap.json
new file mode 100644
index 0000000000000..2c81ea9803fbc
--- /dev/null
+++ b/.github/matchers/tap.json
@@ -0,0 +1,32 @@
+{
+  "//@npmcli/template-oss": "This file is automatically added by @npmcli/template-oss. Do not edit.",
+  "problemMatcher": [
+    {
+      "owner": "tap",
+      "pattern": [
+        {
+          "regexp": "^\\s*not ok \\d+ - (.*)",
+          "message": 1
+        },
+        {
+          "regexp": "^\\s*---"
+        },
+        {
+          "regexp": "^\\s*at:"
+        },
+        {
+          "regexp": "^\\s*line:\\s*(\\d+)",
+          "line": 1
+        },
+        {
+          "regexp": "^\\s*column:\\s*(\\d+)",
+          "column": 1
+        },
+        {
+          "regexp": "^\\s*file:\\s*(.*)",
+          "file": 1
+        }
+      ]
+    }
+  ]
+}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 3ec963f57eff2..1935e6b893a73 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -43,7 +43,6 @@ jobs:
         run: npm i --prefer-online --no-fund --no-audit -g npm@latest
       - run: npm -v
       - name: Update PR ${{ matrix.pr.number }} dependencies and commit
-        if: steps.release.outputs.pr
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
diff --git a/docs/package.json b/docs/package.json
index 8913b255eb831..eb36d5ffb743a 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -24,7 +24,7 @@
     "@npmcli/eslint-config": "^3.1.0",
     "@npmcli/fs": "^2.1.0",
     "@npmcli/promise-spawn": "^3.0.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "cmark-gfm": "^0.9.0",
     "jsdom": "^18.1.0",
     "marked-man": "^0.7.0",
@@ -60,6 +60,6 @@
     "ciVersions": [
       "16"
     ],
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index d52c2266cfb03..600981fc334af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -169,7 +169,7 @@
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
         "@npmcli/promise-spawn": "^3.0.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "fs-minipass": "^2.1.0",
         "licensee": "^8.2.0",
         "minimatch": "^5.1.0",
@@ -189,7 +189,7 @@
         "@npmcli/eslint-config": "^3.1.0",
         "@npmcli/fs": "^2.1.0",
         "@npmcli/promise-spawn": "^3.0.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "cmark-gfm": "^0.9.0",
         "jsdom": "^18.1.0",
         "marked-man": "^0.7.0",
@@ -1095,9 +1095,9 @@
       }
     },
     "node_modules/@npmcli/template-oss": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-3.7.0.tgz",
-      "integrity": "sha512-bdGFcNZQGlHZvMMebd4DmhpWgu2NfDnG0go47Mhw/jwwSQu6hh4EGUdI5E0wx2FeWzoujY8gqPL7vvGXrTehDA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-3.7.1.tgz",
+      "integrity": "sha512-fnaWKI6O27cnv8cE0xiuAk/EYxEy3hj2EDgAd3FfGyP2WsUPrWyrn8C4Z6xcU3C3delTlAhFI/t20D6yiDsevg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -10538,7 +10538,7 @@
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
         "@npmcli/promise-spawn": "^3.0.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "minify-registry-metadata": "^2.2.0",
         "rimraf": "^3.0.2",
         "tap": "^16.0.1",
@@ -10595,7 +10595,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "benchmark": "^2.1.4",
         "chalk": "^4.1.0",
         "minify-registry-metadata": "^2.1.0",
@@ -10618,7 +10618,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
       },
@@ -10641,7 +10641,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "tap": "^16.0.1"
       },
       "engines": {
@@ -10669,7 +10669,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "bin-links": "^3.0.3",
         "minify-registry-metadata": "^2.2.0",
         "mkdirp": "^1.0.4",
@@ -10687,7 +10687,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "tap": "^16.0.1"
       },
       "engines": {
@@ -10703,7 +10703,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
       },
@@ -10720,7 +10720,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "minipass": "^3.1.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
@@ -10739,7 +10739,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "nock": "^13.0.7",
         "tap": "^16.0.1"
       },
@@ -10759,7 +10759,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "libnpmpack": "^4.0.0",
         "lodash.clonedeep": "^4.5.0",
         "nock": "^13.2.4",
@@ -10777,7 +10777,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
       },
@@ -10794,7 +10794,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
       },
@@ -10814,7 +10814,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^3.1.0",
-        "@npmcli/template-oss": "3.7.0",
+        "@npmcli/template-oss": "3.7.1",
         "require-inject": "^1.4.4",
         "tap": "^16.0.1"
       },
diff --git a/package.json b/package.json
index b8d84595abfea..658d2508799dd 100644
--- a/package.json
+++ b/package.json
@@ -206,7 +206,7 @@
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
     "@npmcli/promise-spawn": "^3.0.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "fs-minipass": "^2.1.0",
     "licensee": "^8.2.0",
     "minimatch": "^5.1.0",
@@ -250,7 +250,7 @@
   "templateOSS": {
     "rootRepo": false,
     "rootModule": false,
-    "version": "3.7.0"
+    "version": "3.7.1"
   },
   "license": "Artistic-2.0",
   "engines": {
diff --git a/smoke-tests/package.json b/smoke-tests/package.json
index 0a30d078ebb8a..7bde0038f722f 100644
--- a/smoke-tests/package.json
+++ b/smoke-tests/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
     "@npmcli/promise-spawn": "^3.0.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "minify-registry-metadata": "^2.2.0",
     "rimraf": "^3.0.2",
     "tap": "^16.0.1",
@@ -32,7 +32,7 @@
   "license": "ISC",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0",
+    "version": "3.7.1",
     "workspaceRepo": false
   },
   "tap": {
diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json
index 3adbfafe333e0..c6e2bd25cc1d5 100644
--- a/workspaces/arborist/package.json
+++ b/workspaces/arborist/package.json
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "benchmark": "^2.1.4",
     "chalk": "^4.1.0",
     "minify-registry-metadata": "^2.1.0",
@@ -103,6 +103,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmaccess/package.json b/workspaces/libnpmaccess/package.json
index 72db585fef7df..a56e6b44a00ea 100644
--- a/workspaces/libnpmaccess/package.json
+++ b/workspaces/libnpmaccess/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "nock": "^13.2.4",
     "tap": "^16.0.1"
   },
@@ -46,6 +46,6 @@
   ],
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json
index c40ab8588d2b9..6e2f920ef5d05 100644
--- a/workspaces/libnpmdiff/package.json
+++ b/workspaces/libnpmdiff/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "tap": "^16.0.1"
   },
   "dependencies": {
@@ -61,6 +61,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json
index 85c7af1a1e37c..6340035e9f192 100644
--- a/workspaces/libnpmexec/package.json
+++ b/workspaces/libnpmexec/package.json
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "bin-links": "^3.0.3",
     "minify-registry-metadata": "^2.2.0",
     "mkdirp": "^1.0.4",
@@ -74,6 +74,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmfund/package.json b/workspaces/libnpmfund/package.json
index c1e1507d13acb..75eed3c0cdbc7 100644
--- a/workspaces/libnpmfund/package.json
+++ b/workspaces/libnpmfund/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "tap": "^16.0.1"
   },
   "dependencies": {
@@ -56,6 +56,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmhook/package.json b/workspaces/libnpmhook/package.json
index b58a9e4b7befc..f686c13ad889b 100644
--- a/workspaces/libnpmhook/package.json
+++ b/workspaces/libnpmhook/package.json
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "nock": "^13.2.4",
     "tap": "^16.0.1"
   },
@@ -49,6 +49,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmorg/package.json b/workspaces/libnpmorg/package.json
index f1c14ca6b3146..4fd55d7045ce6 100644
--- a/workspaces/libnpmorg/package.json
+++ b/workspaces/libnpmorg/package.json
@@ -31,7 +31,7 @@
   ],
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "minipass": "^3.1.1",
     "nock": "^13.2.4",
     "tap": "^16.0.1"
@@ -52,6 +52,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmpack/package.json b/workspaces/libnpmpack/package.json
index 9844c928f5588..b5b42dd1a85d6 100644
--- a/workspaces/libnpmpack/package.json
+++ b/workspaces/libnpmpack/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "nock": "^13.0.7",
     "tap": "^16.0.1"
   },
@@ -47,6 +47,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmpublish/package.json b/workspaces/libnpmpublish/package.json
index 86a2921e0a855..2ad578edee9d5 100644
--- a/workspaces/libnpmpublish/package.json
+++ b/workspaces/libnpmpublish/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "libnpmpack": "^4.0.0",
     "lodash.clonedeep": "^4.5.0",
     "nock": "^13.2.4",
@@ -53,6 +53,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmsearch/package.json b/workspaces/libnpmsearch/package.json
index e537e3cbd0716..4b76e082f44e3 100644
--- a/workspaces/libnpmsearch/package.json
+++ b/workspaces/libnpmsearch/package.json
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "nock": "^13.2.4",
     "tap": "^16.0.1"
   },
@@ -48,6 +48,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmteam/package.json b/workspaces/libnpmteam/package.json
index 63eb2728e8d1a..2279caec9750c 100644
--- a/workspaces/libnpmteam/package.json
+++ b/workspaces/libnpmteam/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "nock": "^13.2.4",
     "tap": "^16.0.1"
   },
@@ -42,6 +42,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }
diff --git a/workspaces/libnpmversion/package.json b/workspaces/libnpmversion/package.json
index 0cac4b923c4f8..73c089b5e6f67 100644
--- a/workspaces/libnpmversion/package.json
+++ b/workspaces/libnpmversion/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "3.7.0",
+    "@npmcli/template-oss": "3.7.1",
     "require-inject": "^1.4.4",
     "tap": "^16.0.1"
   },
@@ -47,6 +47,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.7.0"
+    "version": "3.7.1"
   }
 }