diff --git a/deployments/k8s/base/templates/astro-landing/.woodpecker.yml b/deployments/k8s/base/templates/astro-landing/.woodpecker.yml
index a1114f4..cfdeba2 100644
--- a/deployments/k8s/base/templates/astro-landing/.woodpecker.yml
+++ b/deployments/k8s/base/templates/astro-landing/.woodpecker.yml
@@ -2,7 +2,7 @@ steps:
   install:
     image: node:20-alpine
     commands:
-      - npm ci
+      - npm install
     when:
       - event: [push, pull_request]
 
@@ -14,22 +14,13 @@ steps:
       - event: [push, pull_request]
 
   docker:
-    image: docker:24-dind
-    privileged: true
-    commands:
-      - docker build -t zot.orchard9.ai/{{PROJECT_NAME}}:latest .
-      - docker build -t zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} .
-    when:
-      - event: push
-
-  push:
-    image: docker:24-dind
-    privileged: true
-    commands:
-      - echo "$ZOT_PASSWORD" | docker login zot.orchard9.ai -u "$ZOT_USER" --password-stdin
-      - docker push zot.orchard9.ai/{{PROJECT_NAME}}:latest
-      - docker push zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
-    secrets: [zot_user, zot_password]
+    image: woodpeckerci/plugin-kaniko
+    settings:
+      destinations:
+        - registry.threesix.ai/{{PROJECT_NAME}}:latest
+        - registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
+      cache: true
+      skip-tls-verify: true
     when:
       - event: push
         branch: main
@@ -37,7 +28,7 @@ steps:
   deploy:
     image: bitnami/kubectl:latest
     commands:
-      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
+      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
     when:
       - event: push
         branch: main
diff --git a/deployments/k8s/base/templates/default/.woodpecker.yml b/deployments/k8s/base/templates/default/.woodpecker.yml
index 94f0cae..716d9e4 100644
--- a/deployments/k8s/base/templates/default/.woodpecker.yml
+++ b/deployments/k8s/base/templates/default/.woodpecker.yml
@@ -1,21 +1,12 @@
 steps:
-  build:
-    image: docker:24-dind
-    privileged: true
-    commands:
-      - docker build -t zot.orchard9.ai/{{PROJECT_NAME}}:latest .
-      - docker build -t zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} .
-    when:
-      - event: push
-
-  push:
-    image: docker:24-dind
-    privileged: true
-    commands:
-      - echo "$ZOT_PASSWORD" | docker login zot.orchard9.ai -u "$ZOT_USER" --password-stdin
-      - docker push zot.orchard9.ai/{{PROJECT_NAME}}:latest
-      - docker push zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
-    secrets: [zot_user, zot_password]
+  docker:
+    image: woodpeckerci/plugin-kaniko
+    settings:
+      destinations:
+        - registry.threesix.ai/{{PROJECT_NAME}}:latest
+        - registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
+      cache: true
+      skip-tls-verify: true
     when:
       - event: push
         branch: main
@@ -23,7 +14,7 @@ steps:
   deploy:
     image: bitnami/kubectl:latest
     commands:
-      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
+      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
     when:
       - event: push
         branch: main
diff --git a/deployments/k8s/base/templates/go-api/.woodpecker.yml b/deployments/k8s/base/templates/go-api/.woodpecker.yml
index 0cd3c17..979e73a 100644
--- a/deployments/k8s/base/templates/go-api/.woodpecker.yml
+++ b/deployments/k8s/base/templates/go-api/.woodpecker.yml
@@ -14,22 +14,13 @@ steps:
       - event: [push, pull_request]
 
   docker:
-    image: docker:24-dind
-    privileged: true
-    commands:
-      - docker build -t zot.orchard9.ai/{{PROJECT_NAME}}:latest .
-      - docker build -t zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} .
-    when:
-      - event: push
-
-  push:
-    image: docker:24-dind
-    privileged: true
-    commands:
-      - echo "$ZOT_PASSWORD" | docker login zot.orchard9.ai -u "$ZOT_USER" --password-stdin
-      - docker push zot.orchard9.ai/{{PROJECT_NAME}}:latest
-      - docker push zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
-    secrets: [zot_user, zot_password]
+    image: woodpeckerci/plugin-kaniko
+    settings:
+      destinations:
+        - registry.threesix.ai/{{PROJECT_NAME}}:latest
+        - registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
+      cache: true
+      skip-tls-verify: true
     when:
       - event: push
         branch: main
@@ -37,7 +28,7 @@ steps:
   deploy:
     image: bitnami/kubectl:latest
     commands:
-      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
+      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
     when:
       - event: push
         branch: main
diff --git a/internal/adapter/templates/templates/astro-landing/.woodpecker.yml b/internal/adapter/templates/templates/astro-landing/.woodpecker.yml
index 41471d1..cfdeba2 100644
--- a/internal/adapter/templates/templates/astro-landing/.woodpecker.yml
+++ b/internal/adapter/templates/templates/astro-landing/.woodpecker.yml
@@ -17,8 +17,8 @@ steps:
     image: woodpeckerci/plugin-kaniko
     settings:
       destinations:
-        - zot.orchard9.ai/{{PROJECT_NAME}}:latest
-        - zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
+        - registry.threesix.ai/{{PROJECT_NAME}}:latest
+        - registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
       cache: true
       skip-tls-verify: true
     when:
@@ -28,7 +28,7 @@ steps:
   deploy:
     image: bitnami/kubectl:latest
     commands:
-      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
+      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
     when:
       - event: push
         branch: main
diff --git a/internal/adapter/templates/templates/default/.woodpecker.yml b/internal/adapter/templates/templates/default/.woodpecker.yml
index d3b7211..716d9e4 100644
--- a/internal/adapter/templates/templates/default/.woodpecker.yml
+++ b/internal/adapter/templates/templates/default/.woodpecker.yml
@@ -3,8 +3,8 @@ steps:
     image: woodpeckerci/plugin-kaniko
     settings:
       destinations:
-        - zot.orchard9.ai/{{PROJECT_NAME}}:latest
-        - zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
+        - registry.threesix.ai/{{PROJECT_NAME}}:latest
+        - registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
       cache: true
       skip-tls-verify: true
     when:
@@ -14,7 +14,7 @@ steps:
   deploy:
     image: bitnami/kubectl:latest
     commands:
-      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
+      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
     when:
       - event: push
         branch: main
diff --git a/internal/adapter/templates/templates/go-api/.woodpecker.yml b/internal/adapter/templates/templates/go-api/.woodpecker.yml
index 92f8a5f..979e73a 100644
--- a/internal/adapter/templates/templates/go-api/.woodpecker.yml
+++ b/internal/adapter/templates/templates/go-api/.woodpecker.yml
@@ -17,8 +17,8 @@ steps:
     image: woodpeckerci/plugin-kaniko
     settings:
       destinations:
-        - zot.orchard9.ai/{{PROJECT_NAME}}:latest
-        - zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
+        - registry.threesix.ai/{{PROJECT_NAME}}:latest
+        - registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8}
       cache: true
       skip-tls-verify: true
     when:
@@ -28,7 +28,7 @@ steps:
   deploy:
     image: bitnami/kubectl:latest
     commands:
-      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=zot.orchard9.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
+      - kubectl set image deployment/{{PROJECT_NAME}} {{PROJECT_NAME}}=registry.threesix.ai/{{PROJECT_NAME}}:${CI_COMMIT_SHA:0:8} -n projects
     when:
       - event: push
         branch: main