diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index ebe03b6..7c52a66 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,42 +1,40 @@
 steps:
   build-frontend:
+    name: Build & Push Frontend
+    image: woodpeckerci/plugin-kaniko
     when:
       event: [ push, pull_request, tag ]
       path:
         include: [ frontend/** ]
-    image: gcr.io/kaniko-project/executor:latest
-    secrets:
-      - DOCKER_USERNAME
-      - DOCKER_PASSWORD
-    volumes:
-      - name: docker-config
-        path: /kaniko/.docker/
-    commands:
-      - echo "{\"auths\":{\"https://harbor.dvirlabs.com\":{\"username\":\"${DOCKER_USERNAME}\",\"password\":\"${DOCKER_PASSWORD}\"}}}" > /kaniko/.docker/config.json
-      - /kaniko/executor \
-          --dockerfile=frontend/Dockerfile \
-          --context=frontend \
-          --destination=harbor.dvirlabs.com/my-apps/labmap-frontend:latest
+    settings:
+      registry: harbor.dvirlabs.com
+      repo: harbor.dvirlabs.com/my-apps/labmap-frontend
+      dockerfile: frontend/Dockerfile
+      context: frontend
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:7}
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
 
   build-backend:
+    name: Build & Push Backend
+    image: woodpeckerci/plugin-kaniko
     when:
       event: [ push, pull_request, tag ]
       path:
         include: [ backend/** ]
-    image: gcr.io/kaniko-project/executor:latest
-    secrets:
-      - DOCKER_USERNAME
-      - DOCKER_PASSWORD
-    volumes:
-      - name: docker-config
-        path: /kaniko/.docker/
-    commands:
-      - echo "{\"auths\":{\"https://harbor.dvirlabs.com\":{\"username\":\"${DOCKER_USERNAME}\",\"password\":\"${DOCKER_PASSWORD}\"}}}" > /kaniko/.docker/config.json
-      - /kaniko/executor \
-          --dockerfile=backend/Dockerfile \
-          --context=backend \
-          --destination=harbor.dvirlabs.com/my-apps/labmap-backend:latest
-
-volumes:
-  - name: docker-config
-    temp: {}
+    settings:
+      registry: harbor.dvirlabs.com
+      repo: harbor.dvirlabs.com/my-apps/labmap-backend
+      dockerfile: backend/Dockerfile
+      context: backend
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:7}
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD