diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3cb96d705..54e84fce9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,8 +6,6 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
-      - id: check-yaml
-        exclude: 'pipeline/frontend/yaml/linter/schema/.woodpecker/test-merge-map-and-sequence.yml'
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/golangci/golangci-lint
@@ -32,6 +30,11 @@ repos:
     rev: v3.1.0
     hooks:
       - id: prettier
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.32.0
+    hooks:
+      - id: yamllint
+        args: [--strict, -c=.yamllint.yaml]
 
 ci:
   autofix_commit_msg: |
diff --git a/.yamllint.yaml b/.yamllint.yaml
new file mode 100644
index 000000000..f5190b172
--- /dev/null
+++ b/.yamllint.yaml
@@ -0,0 +1,13 @@
+extends: default
+
+ignore-from-file:
+  - docs/.gitignore
+  - docs/plugins/woodpecker-plugins/.gitignore
+  - .gitignore
+  - server/store/datastore/migration/testfiles/.gitignore
+  - web/.gitignore
+
+rules:
+  line-length: disable
+  document-start: disable
+  comments: disable