diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93f48b12..fddf82ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,12 +4,6 @@ on:
   pull_request:
 
 jobs:
-  commit_msg:
-    name: Conventional Commit Messages
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: webiny/action-conventional-commits@v1.3.0
   stylua:
     name: Stylua Formatting
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 00000000..0401a4d8
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,41 @@
+name: "Lint PR"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+permissions:
+  pull-requests: read
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          requireScope: true
+          subjectPattern: ^(?![A-Z]).+$
+          scopes: |
+            .+
+          types: |
+            build
+            chore
+            ci
+            docs
+            feat
+            fix
+            merge
+            perf
+            refactor
+            revert
+            style
+            test
+            wip
+          ignoreLabels: |
+            autorelease: pending