diff --git a/.woodpecker.yaml b/.woodpecker/.build.yaml
similarity index 86%
rename from .woodpecker.yaml
rename to .woodpecker/.build.yaml
index ffb8897..13a3abc 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker/.build.yaml
@@ -12,7 +12,9 @@ steps:
       password:
         from_secret: gitea_token
       repo: git.verdigado.com/${CI_REPO,,}
-      tag: 'latest'
+      tags:
+        - 'latest'
+        - ${CI_COMMIT_SHA}
 
   build-branch:
     when:
@@ -28,4 +30,6 @@ steps:
       password:
         from_secret: gitea_token
       repo: git.verdigado.com/${CI_REPO,,}
-      tag: ${CI_COMMIT_BRANCH}
+      tags:
+        - ${CI_COMMIT_BRANCH}
+        - ${CI_COMMIT_SHA}
diff --git a/.woodpecker/.test.yaml b/.woodpecker/.test.yaml
new file mode 100644
index 0000000..00d4462
--- /dev/null
+++ b/.woodpecker/.test.yaml
@@ -0,0 +1,20 @@
+steps:
+  test-salt-clone:
+    image: woodpeckerci/plugin-git
+    settings:
+      remote: https://git.verdigado.com/verdigado-Privileged/Salt.git
+      path: salt
+      sha: ''
+      ref: refs/heads/master
+      branch: master
+
+  test-salt-pre-commit:
+    image: git.verdigado.com/verdigado-images/container-pre-commit:${CI_COMMIT_SHA}
+    environment:
+      - SKIP=no-commit-to-branch # Ignore "don't commit to protected branch" check
+    commands:
+      - cd salt
+      - pre-commit run --all-files
+
+depends_on:
+  - build