diff --git a/.woodpecker.yml b/.woodpecker.yml
index 322ab14..55235a6 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -29,7 +29,8 @@ steps:
   - name: build-and-push
     image: registry.nxtgauge.com/kaniko:2.1.1
     settings:
-      registry: registry.nxtgauge.com
+      registry:
+        from_secret: REGISTRY_HOSTPORT
       username:
         from_secret: REGISTRY_USERNAME
       password:
@@ -52,7 +53,8 @@ steps:
   - name: build-and-push-migrate
     image: registry.nxtgauge.com/kaniko:2.1.1
     settings:
-      registry: registry.nxtgauge.com
+      registry:
+        from_secret: REGISTRY_HOSTPORT
       username:
         from_secret: REGISTRY_USERNAME
       password:
diff --git a/Dockerfile.migrate b/Dockerfile.migrate
index 390bc2a..77194b5 100644
--- a/Dockerfile.migrate
+++ b/Dockerfile.migrate
@@ -2,6 +2,7 @@ FROM registry.nxtgauge.com/rust:alpine AS builder
 
 WORKDIR /app
 
+RUN command -v cargo >/dev/null 2>&1 || apk add --no-cache cargo rust
 RUN apk add --no-cache musl-dev pkgconfig openssl-dev
 
 COPY Cargo.toml Cargo.lock ./
diff --git a/Dockerfile.simple b/Dockerfile.simple
index 4fbbf74..5e38127 100644
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -7,6 +7,7 @@ FROM registry.nxtgauge.com/rust:alpine AS builder
 ARG SERVICE_NAME
 
 # Install deps
+RUN command -v cargo >/dev/null 2>&1 || apk add --no-cache cargo rust
 RUN apk add --no-cache musl-dev pkgconfig openssl-dev openssl-libs-static
 
 WORKDIR /app