diff --git a/.woodpecker.yml b/.woodpecker.yml
index bfcea54..12b77e7 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,17 +4,16 @@ when:
 
 steps:
   - name: build-and-push
-    image: registry.nxtgauge.com/docker:28-cli
-    environment:
-      REGISTRY_HOSTPORT: registry.nxtgauge.com
-      REGISTRY_USERNAME:
+    image: registry.nxtgauge.com/kaniko:2.1.1
+    settings:
+      registry: registry.nxtgauge.com
+      username:
         from_secret: REGISTRY_USERNAME
-      REGISTRY_PASSWORD:
+      password:
         from_secret: REGISTRY_PASSWORD
-    commands:
-      - test -n "${REGISTRY_HOSTPORT:-}" || (echo "missing REGISTRY_HOSTPORT" && exit 1)
-      - test -n "${REGISTRY_USERNAME:-}" || (echo "missing REGISTRY_USERNAME" && exit 1)
-      - test -n "${REGISTRY_PASSWORD:-}" || (echo "missing REGISTRY_PASSWORD" && exit 1)
-      - echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_HOSTPORT" -u "$REGISTRY_USERNAME" --password-stdin
-      - docker build -t "${REGISTRY_HOSTPORT}/nxtgauge-frontend-solid" -f Dockerfile .
-      - docker push "${REGISTRY_HOSTPORT}/nxtgauge-frontend-solid"
+      repo: nxtgauge-frontend-solid
+      tags:
+        - ${CI_COMMIT_SHA}
+        - ${CI_COMMIT_BRANCH}-latest
+      dockerfile: Dockerfile
+      context: .