diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 8ec209b..b822373 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -9,6 +9,10 @@ on:
     - cron: "0 11 * * 0" # 3 AM PST = 12 PM UDT, runs sundays
   workflow_dispatch:
 
+permissions: # used for commitlint
+  contents: read
+  pull-requests: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -80,6 +84,31 @@ jobs:
         with:
           sarif_file: "trivy-results.sarif"
 
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: install eslint packages
+        run: npm ci
+      - uses: actions/setup-python@v1
+      - name: set PY
+        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - uses: pre-commit/action@v1.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  commitlint: # Test all commits in PR follow conventional commit format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: wagoid/commitlint-github-action@v6
+        with:
+          configFile: '.commitlintrc.yml'
+
   results:
     name: Analysis Results
     needs: [tests] # Restore trivy when/if fixed
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 960387e..08e19d5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,10 +8,10 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: "v9.15.0" # Use the sha / tag you want to point at
+    rev: "v9.15.0"
     hooks:
       - id: eslint
-        files: \.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx
+        files: \.[jt]sx?$
         types: [file]
 
   - repo: https://github.com/rbubley/mirrors-prettier