diff --git a/.github/workflows/validate-commits.yml b/.github/workflows/validate-commits.yml
index 0de844b..2333262 100644
--- a/.github/workflows/validate-commits.yml
+++ b/.github/workflows/validate-commits.yml
@@ -1,17 +1,18 @@
-name: Validate Commits and Predict Version
+name: Validate Commits
 
 on:
-  push:
-    branches:
-      - '*'
-      - '!main'
-      - '!master'
   pull_request:
     branches:
-      - '*'
+      - main
 
 jobs:
-  validate-commits-and-lint-charts:
+  branch-name:
+    uses: nullplatform/actions-nullplatform-terraform/.github/workflows/branch-validation.yml@main
+
+  commitlint:
+    uses: nullplatform/actions-nullplatform-terraform/.github/workflows/conventional-commit.yml@main
+
+  lint-charts:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
@@ -19,21 +20,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "22"
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Validate branch name
-        run: ./scripts/validate-branch-name.sh "${GITHUB_HEAD_REF:-${GITHUB_REF_NAME}}"
-
-      - name: Validate commit messages
-        run: npx commitlint --from ${{ github.event.pull_request.base.sha || 'HEAD~10' }} --to ${{ github.sha }} --verbose
-
       - name: Set up Helm
         uses: azure/setup-helm@v4