diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2af69ff..d1fe1d8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -2,7 +2,6 @@
 # Builds and deploys rdev-api, rdev-worker, and rdev-claudebox
 
 variables:
-  - &registry "registry.threesix.ai"
   - &when_main
     branch: main
     event: push
@@ -17,43 +16,49 @@ steps:
 
   # Build rdev-api image
   build-api:
-    image: gcr.io/kaniko-project/executor:v1.23.2-debug
-    commands:
-      - /kaniko/executor
-        --context=/woodpecker/src
-        --dockerfile=Dockerfile.api
-        --destination=registry.threesix.ai/rdev/api:${CI_COMMIT_SHA:0:8}
-        --destination=registry.threesix.ai/rdev/api:latest
-        --cache=true
-        --skip-tls-verify
+    image: woodpeckerci/plugin-kaniko
+    settings:
+      registry: registry.threesix.ai
+      repo: rdev/api
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:8}
+      context: .
+      dockerfile: Dockerfile.api
+      cache: true
+      skip_tls_verify: true
     when:
       <<: *when_main
 
   # Build rdev-worker image
   build-worker:
-    image: gcr.io/kaniko-project/executor:v1.23.2-debug
-    commands:
-      - /kaniko/executor
-        --context=/woodpecker/src
-        --dockerfile=Dockerfile.worker
-        --destination=registry.threesix.ai/rdev/worker:${CI_COMMIT_SHA:0:8}
-        --destination=registry.threesix.ai/rdev/worker:latest
-        --cache=true
-        --skip-tls-verify
+    image: woodpeckerci/plugin-kaniko
+    settings:
+      registry: registry.threesix.ai
+      repo: rdev/worker
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:8}
+      context: .
+      dockerfile: Dockerfile.worker
+      cache: true
+      skip_tls_verify: true
     when:
       <<: *when_main
 
   # Build rdev-claudebox image
   build-claudebox:
-    image: gcr.io/kaniko-project/executor:v1.23.2-debug
-    commands:
-      - /kaniko/executor
-        --context=/woodpecker/src
-        --dockerfile=Dockerfile
-        --destination=registry.threesix.ai/rdev/claudebox:${CI_COMMIT_SHA:0:8}
-        --destination=registry.threesix.ai/rdev/claudebox:latest
-        --cache=true
-        --skip-tls-verify
+    image: woodpeckerci/plugin-kaniko
+    settings:
+      registry: registry.threesix.ai
+      repo: rdev/claudebox
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:8}
+      context: .
+      dockerfile: Dockerfile
+      cache: true
+      skip_tls_verify: true
     when:
       <<: *when_main
 
@@ -72,4 +77,3 @@ steps:
       - kubectl rollout status statefulset/claudebox -n rdev --timeout=300s
     when:
       <<: *when_main
-