diff --git a/.woodpecker.yml b/.woodpecker.yml
index 6b972c8..e75dcea 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -26,16 +26,31 @@ matrix:
 steps:
   - name: build-and-push
     image: woodpeckerci/plugin-docker-buildx:5.0.0
-    environment:
-      REGISTRY_HOSTPORT: docker-registry.registry.svc.cluster.local:5000
-      REGISTRY_USERNAME:
-        from_secret: DOCKERHUB_USERNAME
-      REGISTRY_PASSWORD:
-        from_secret: DOCKERHUB_TOKEN
-    commands:
-      - 'test -n "${REGISTRY_USERNAME}" && test -n "${REGISTRY_PASSWORD}" || (echo "Missing one or more required secrets: DOCKERHUB_USERNAME, DOCKERHUB_TOKEN" && 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
+    settings:
+      insecure: true
+      registry: docker-registry.registry.svc.cluster.local:5000
+      repo: docker-registry.registry.svc.cluster.local:5000/nxtgauge-rust-${SERVICE}
+      dockerfile: Dockerfile.simple
+      build_args:
+        - SERVICE_NAME=${SERVICE}
+      tags:
+        - ${CI_COMMIT_SHA}
+        - latest
+        - high-performance-latest
+      logins:
+        - registry: https://index.docker.io/v1/
+          username:
+            from_secret: DOCKERHUB_USERNAME
+          password:
+            from_secret: DOCKERHUB_TOKEN
+        - registry: ghcr.io
+          username:
+            from_secret: GHCR_USERNAME
+          password:
+            from_secret: GHCR_TOKEN
+      username:
+        from_secret: REGISTRY_USERNAME
+      password:
+        from_secret: REGISTRY_PASSWORD
+      platforms: linux/amd64
+      no_cache: true