diff --git a/.gitlint b/.gitlint
new file mode 100644
index 0000000000..9ce883f49c
--- /dev/null
+++ b/.gitlint
@@ -0,0 +1,10 @@
+[general]
+fail-without-commits=true
+contrib=CC1
+
+[title-match-regex]
+regex=^\[\#[0-9]+\]\s
+
+[ignore-by-title]
+regex=^Release(.*)
+ignore=title-match-regex
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e7edc6cb74..ce47092834 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,3 +22,9 @@ repos:
     rev: v1.51.2
     hooks:
       - id: golangci-lint
+
+  - repo: https://github.com/jorisroovers/gitlint
+    rev:  v0.18.0
+    hooks:
+      - id: gitlint
+        stages: [commit-msg]