diff --git a/.buildkite/pipeline.sh b/.buildkite/pipeline.sh
index ce075bb2f..f60916993 100755
--- a/.buildkite/pipeline.sh
+++ b/.buildkite/pipeline.sh
@@ -28,8 +28,6 @@ env:
 steps:
   - label: ":service_dog: Linting"
     command: "reviewdog -reporter=github-check -filter-mode=nofilter -fail-on-error"
-    retry:
-      automatic: true
     if: build.branch !~ /^(v[0-9]+\.[0-9]+\.[0-9]+)$\$/ && build.message !~ /\[(skip test|test skip)\]/
 
   - label: ":hammer_and_wrench: Unit Test"
diff --git a/.github/commit-msg b/.github/commit-msg
index 90e11d13e..f2d9598de 100755
--- a/.github/commit-msg
+++ b/.github/commit-msg
@@ -2,4 +2,4 @@
 . "$(dirname "$0")/_/husky.sh"
 . "$(dirname "$0")/required-apps"
 
-cd web && ${PMGR} commitlint
+cd web && ${PMGR} run commitlint --edit $1
diff --git a/web/package.json b/web/package.json
index a05318bee..a7aa60a79 100644
--- a/web/package.json
+++ b/web/package.json
@@ -28,8 +28,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "coverage": "COVERAGE=true craco build",
     "test": "craco test --coverage --no-cache",
-    "report": "nyc report -r clover -r json -r lcov -r text",
-    "commitlint": "commitlint --edit $1"
+    "report": "nyc report -r clover -r json -r lcov -r text"
   },
   "eslintConfig": {
     "extends": "react-app"