diff --git a/.github/semantic.yml b/.github/semantic.yml
deleted file mode 100644
index fa15046b4a..0000000000
--- a/.github/semantic.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Always validate the PR title AND all the commits
-titleAndCommits: true
-
-# Allow use of Merge commits (eg on github: "Merge branch 'master' into feature/ride-unicorns")
-# this is only relevant when using commitsOnly: true (or titleAndCommits: true)
-allowMergeCommits: true
-
-# Allow use of Revert commits (eg on github: "Revert "feat: ride unicorns"")
-# this is only relevant when using commitsOnly: true (or titleAndCommits: true)
-allowRevertCommits: true
-
-# For allowed PR types: https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json
-# Tool Reference: https://github.com/zeke/semantic-pull-requests
-
-# By default types specified in commitizen/conventional-commit-types is used.
-# See: https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json
-# You can override the valid types
-types:
-  - BREAKING CHANGE
-  - feat
-  - fix
-  - docs
-  - style
-  - refactor
-  - perf
-  - test
-  - build
-  - ci
-  - chore
-  - revert
diff --git a/.mergify.yml b/.mergify.yml
index d9896df921..a863ee67dd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -21,6 +21,7 @@ pull_request_rules:
   - name: Automatic merge on CI success and review
     conditions:
       - status-success=Sider
+      - status-success=Check Commit Titles
       - status-success=Python Unit Tests (MariaDB) (1)
       - status-success=Python Unit Tests (MariaDB) (2)
       - status-success=Python Unit Tests (Postgres) (1)
diff --git a/commitlint.config.js b/commitlint.config.js
new file mode 100644
index 0000000000..8847564e53
--- /dev/null
+++ b/commitlint.config.js
@@ -0,0 +1,25 @@
+module.exports = {
+	parserPreset: 'conventional-changelog-conventionalcommits',
+	rules: {
+		'subject-empty': [2, 'never'],
+		'type-case': [2, 'always', 'lower-case'],
+		'type-empty': [2, 'never'],
+		'type-enum': [
+			2,
+			'always',
+			[
+				'build',
+				'chore',
+				'ci',
+				'docs',
+				'feat',
+				'fix',
+				'perf',
+				'refactor',
+				'revert',
+				'style',
+				'test',
+			],
+		],
+	},
+};
diff --git a/package.json b/package.json
index 49617caf7e..c4ba042a89 100644
--- a/package.json
+++ b/package.json
@@ -82,10 +82,5 @@
   "snyk": true,
   "nyc": {
     "report-dir": ".cypress-coverage"
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
   }
 }