diff --git a/.woodpecker/.audit.yaml b/.woodpecker/.audit.yaml
new file mode 100644
index 0000000..905f259
--- /dev/null
+++ b/.woodpecker/.audit.yaml
@@ -0,0 +1,18 @@
+variables:
+  - shared-config: &shared-config
+      image: rg.fr-par.scw.cloud/asr-projects/beau-gosse-du-92/ci-lint-audit:latest
+      pull: true
+
+steps:
+  - name: dependencies
+    <<: *shared-config
+    commands: |
+      cargo deny check
+    # Not ready to block PR on fail
+    failure: ignore
+
+when:
+  - event: pull_request
+
+depends_on:
+  - lint
diff --git a/.woodpecker/.dependencies.yaml b/.woodpecker/.dependencies.yaml
index 9a6d3ce..7028509 100644
--- a/.woodpecker/.dependencies.yaml
+++ b/.woodpecker/.dependencies.yaml
@@ -2,7 +2,6 @@ steps:
   - name: renovate
     image: renovate/renovate
     pull: true
-    settings:
     commands:
       - renovate $${CI_REPO}
     environment:
diff --git a/.woodpecker/.lint-audit-image.yaml b/.woodpecker/.lint-audit-image.yaml
index 4bcc832..c0b02b7 100644
--- a/.woodpecker/.lint-audit-image.yaml
+++ b/.woodpecker/.lint-audit-image.yaml
@@ -13,4 +13,5 @@ steps:
         from_secret: registry-password
 
 when:
-  - path: ./docker/Dockerfile.ci-lint-audit
+  - event: push
+    path: ./docker/Dockerfile.ci-lint-audit
diff --git a/.woodpecker/.lint.yaml b/.woodpecker/.lint.yaml
new file mode 100644
index 0000000..6a2568f
--- /dev/null
+++ b/.woodpecker/.lint.yaml
@@ -0,0 +1,45 @@
+variables:
+  - shared-config: &shared-config
+      image: rg.fr-par.scw.cloud/asr-projects/beau-gosse-du-92/ci-lint-audit:latest
+      pull: true
+
+steps:
+  - name: format
+    <<: *shared-config
+    commands: |
+      cargo fmt --all --check
+
+  - name: sort derives
+    <<: *shared-config
+    commands: |
+      cargo sort-derives --check
+
+  - name: clippy
+    <<: *shared-config
+    commands: |
+      cargo clippy --all --all-features -- -D warnings
+    # Not ready to block PR on fail
+    failure: ignore
+
+  - name: spellcheck
+    <<: *shared-config
+    commands: |
+      cargo spellcheck
+
+  - name: dependencies
+    <<: *shared-config
+    commands: |
+      cargo udeps
+
+  - name: dockerizable (web)
+    image: woodpeckerci/plugin-kaniko
+    settings:
+      registry: rg.fr-par.scw.cloud
+      repo: asr-projects/beau-gosse-du-92-web
+      username: nologin
+      password:
+        from_secret: registry-password
+      dry-run: true
+
+when:
+  - event: pull_request
diff --git a/.woodpecker/.validate.yaml b/.woodpecker/.validate.yaml
deleted file mode 100644
index 7da50a4..0000000
--- a/.woodpecker/.validate.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-variables:
-  - &image rg.fr-par.scw.cloud/asr-projects/beau-gosse-du-92/ci-lint-audit:latest
-
-steps:
-  - name: lint - format
-    image: *image
-    pull: true
-    commands: |
-      cargo fmt --all --check
-
-  - name: lint - sort derives
-    image: *image
-    pull: true
-    commands: |
-      cargo sort-derives --check
-
-  - name: lint - clippy
-    image: *image
-    pull: true
-    commands: |
-      cargo clippy --all --all-features -- -D warnings
-    # Not ready to block PR on fail
-    failure: ignore
-
-  - name: lint - spellcheck
-    image: *image
-    pull: true
-    commands: |
-      cargo spellcheck
-
-  - name: lint - dependencies
-    image: *image
-    pull: true
-    commands: |
-      cargo udeps
-
-  - name: build - web (dockerize)
-    image: woodpeckerci/plugin-kaniko
-    settings:
-      registry: rg.fr-par.scw.cloud
-      repo: asr-projects/beau-gosse-du-92-web
-      username: nologin
-      password:
-        from_secret: registry-password
-      dry-run: true
-
-  - name: audit - dependencies
-    image: *image
-    pull: true
-    commands: |
-      cargo deny check
-    # Not ready to block PR on fail
-    failure: ignore
-
-when:
-  - event: pull_request
-  # - event: push
-  #   branch: ${CI_REPO_DEFAULT_BRANCH}