diff --git a/.woodpecker.yml b/.woodpecker.yml
index 22e38ab..827cf2d 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -25,15 +25,18 @@ matrix:
 
 steps:
   - name: build-and-push
-    image: docker:24-cli
+    image: woodpeckerci/plugin-docker-buildx:5.0.0
     environment:
+      REGISTRY_HOSTPORT:
+        from_secret: REGISTRY_HOSTPORT
       REGISTRY_USERNAME:
-        from_secret: DOCKERHUB_USERNAME
+        from_secret: REGISTRY_USERNAME
       REGISTRY_PASSWORD:
-        from_secret: DOCKERHUB_TOKEN
+        from_secret: REGISTRY_PASSWORD
     commands:
-      - echo "${REGISTRY_PASSWORD}" | docker login docker-registry.registry.svc.cluster.local:5000 -u "${REGISTRY_USERNAME}" --password-stdin
-      - docker build -f Dockerfile.simple --build-arg SERVICE_NAME=${SERVICE} -t docker-registry.registry.svc.cluster.local:5000/nxtgauge-rust-${SERVICE}:${CI_COMMIT_SHA} -t docker-registry.registry.svc.cluster.local:5000/nxtgauge-rust-${SERVICE}:latest -t docker-registry.registry.svc.cluster.local:5000/nxtgauge-rust-${SERVICE}:high-performance-latest .
-      - docker push docker-registry.registry.svc.cluster.local:5000/nxtgauge-rust-${SERVICE}:${CI_COMMIT_SHA}
-      - docker push docker-registry.registry.svc.cluster.local:5000/nxtgauge-rust-${SERVICE}:latest
-      - docker push docker-registry.registry.svc.cluster.local:5000/nxtgauge-rust-${SERVICE}:high-performance-latest
+      - test -n "${REGISTRY_HOSTPORT}" && test -n "${REGISTRY_USERNAME}" && test -n "${REGISTRY_PASSWORD}" || (echo "Missing one or more required secrets: REGISTRY_HOSTPORT, REGISTRY_USERNAME, REGISTRY_PASSWORD" && exit 1)
+      - echo "${REGISTRY_PASSWORD}" | docker login "${REGISTRY_HOSTPORT}" -u "${REGISTRY_USERNAME}" --password-stdin
+      - docker build -f Dockerfile.simple --build-arg SERVICE_NAME=${SERVICE} -t ${REGISTRY_HOSTPORT}/nxtgauge-rust-${SERVICE}:${CI_COMMIT_SHA} -t ${REGISTRY_HOSTPORT}/nxtgauge-rust-${SERVICE}:latest -t ${REGISTRY_HOSTPORT}/nxtgauge-rust-${SERVICE}:high-performance-latest .
+      - docker push ${REGISTRY_HOSTPORT}/nxtgauge-rust-${SERVICE}:${CI_COMMIT_SHA}
+      - docker push ${REGISTRY_HOSTPORT}/nxtgauge-rust-${SERVICE}:latest
+      - docker push ${REGISTRY_HOSTPORT}/nxtgauge-rust-${SERVICE}:high-performance-latest