diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2ad8e4d..902fe72 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,16 +35,6 @@ repos:
   # Kubernetes manifest validation
   - repo: local
     hooks:
-      - id: kubeconform_validate_apps
-        name: kubeconform validate apps
-        entry: ci/validate-apps.sh
-        language: system
-        pass_filenames: false
-      - id: kubeconform_validate_clusters
-        name: kubeconform validate clusters
-        entry: ci/validate-clusters.sh
-        language: system
-        pass_filenames: false
       - id: no_plain_secrets
         name: prevent plain kubernetes secrets
         entry: ci/validate-no-secrets.sh
diff --git a/.woodpecker/kubeconform.yaml b/.woodpecker/kubeconform.yaml
new file mode 100644
index 0000000..88fc8bc
--- /dev/null
+++ b/.woodpecker/kubeconform.yaml
@@ -0,0 +1,9 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: kubeconform
+    image: git.unkin.net/unkin/almalinux9-base:latest
+    commands:
+      - dnf install make kustomize kubeconform helm -y
+      - make kubeconform
diff --git a/.woodpecker/pre-commit.yaml b/.woodpecker/pre-commit.yaml
index a52b072..bf6529f 100644
--- a/.woodpecker/pre-commit.yaml
+++ b/.woodpecker/pre-commit.yaml
@@ -5,5 +5,5 @@ steps:
   - name: pre-commit
     image: git.unkin.net/unkin/almalinux9-base:latest
     commands:
-      - dnf install uv kustomize kubeconform helm -y
+      - dnf install uv make -y
       - uvx pre-commit run --all-files
diff --git a/Makefile b/Makefile
index e480a14..7c3849e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,11 @@ build:
 	@mkdir -p manifests/$(filter-out $@,$(MAKECMDGOALS))
 	@kustomize build --enable-helm $(filter-out $@,$(MAKECMDGOALS)) --output manifests/$(filter-out $@,$(MAKECMDGOALS))
 
+# kubeconform
+kubeconform:
+	@ci/validate-apps.sh && \
+	ci/validate-clusters.sh
+
 # Clean all generated manifests
 clean:
 	@rm -rf manifests/