diff --git a/commitlint.yaml b/commitlint.yaml
new file mode 100644
index 00000000..7bfe0a35
--- /dev/null
+++ b/commitlint.yaml
@@ -0,0 +1,24 @@
+include: package:commitlint_cli/commitlint.yaml
+
+rules:
+  scope-empty:
+    - 2
+    - never
+  scope-enum:
+    - 2
+    - always
+    - - ci
+      - deps
+      - docs
+      - tool
+      - app
+      - dynamite
+      - dynamite_runtime
+      - file_icons
+      - neon
+      - neon_files
+      - neon_news
+      - neon_notes
+      - neon_notifications
+      - nextcloud
+      - sort_box
diff --git a/pubspec.yaml b/pubspec.yaml
index 2abbb105..cb4afeff 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,5 +4,6 @@ publish_to: none
 environment:
   sdk: '>=3.0.0 <4.0.0'
 dev_dependencies:
+  commitlint_cli: ^0.4.1
   fvm: ^2.4.1
   melos: ^3.1.0