diff --git a/.woodpecker.yml b/.woodpecker.yml
index f26233b..b386490 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,13 +1,18 @@
-pipeline:
-  docker:
-    image: plugins/kaniko
-    settings:
-      repo: harbor.k-space.ee/${CI_REPO}
-      registry: harbor.k-space.ee
-      tags: latest
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch: main
+when:
+- event: push
+  branch: main
+
+steps:
+- name: publish
+  image: woodpeckerci/plugin-kaniko
+  settings:
+    registry: harbor.k-space.ee
+    repo: harbor.k-space.ee/${CI_REPO}
+    tags: latest,${CI_COMMIT_SHA}
+    cache: true
+    build_args:
+    - COMMIT_SHA=${CI_COMMIT_SHA}
+    username:
+      from_secret: docker-username
+    password:
+      from_secret: docker-password