diff --git a/.woodpecker.yml b/.woodpecker.yml
index 135404c..72bac81 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -28,21 +28,16 @@ matrix:
     - ugc-content-creators
     - cron
 
-secrets:
-  - secret: REGISTRY_HOSTPORT
-    name: REGISTRY_HOSTPORT
-  - secret: REGISTRY_USERNAME
-    name: REGISTRY_USERNAME
-  - secret: REGISTRY_PASSWORD
-    name: REGISTRY_PASSWORD
-
 steps:
   - name: build-and-push
     image: registry.nxtgauge.com/docker:28-cli
     environment:
-      REGISTRY_HOSTPORT: ${REGISTRY_HOSTPORT}
-      REGISTRY_USERNAME: ${REGISTRY_USERNAME}
-      REGISTRY_PASSWORD: ${REGISTRY_PASSWORD}
+      REGISTRY_HOSTPORT:
+        from_secret: REGISTRY_HOSTPORT
+      REGISTRY_USERNAME:
+        from_secret: REGISTRY_USERNAME
+      REGISTRY_PASSWORD:
+        from_secret: REGISTRY_PASSWORD
     commands:
       - echo "${REGISTRY_PASSWORD}" | docker login "${REGISTRY_HOSTPORT}" -u "${REGISTRY_USERNAME}" --password-stdin
       - docker build -t "${REGISTRY_HOSTPORT}/nxtgauge-rust-${SERVICE}" --build-arg SERVICE_NAME=${SERVICE} -f Dockerfile.simple .
@@ -53,21 +48,16 @@ when:
   branch: [main, high-performance]
   event: push
 
-secrets:
-  - secret: REGISTRY_HOSTPORT
-    name: REGISTRY_HOSTPORT
-  - secret: REGISTRY_USERNAME
-    name: REGISTRY_USERNAME
-  - secret: REGISTRY_PASSWORD
-    name: REGISTRY_PASSWORD
-
 steps:
   - name: build-and-push-migrate
     image: registry.nxtgauge.com/docker:28-cli
     environment:
-      REGISTRY_HOSTPORT: ${REGISTRY_HOSTPORT}
-      REGISTRY_USERNAME: ${REGISTRY_USERNAME}
-      REGISTRY_PASSWORD: ${REGISTRY_PASSWORD}
+      REGISTRY_HOSTPORT:
+        from_secret: REGISTRY_HOSTPORT
+      REGISTRY_USERNAME:
+        from_secret: REGISTRY_USERNAME
+      REGISTRY_PASSWORD:
+        from_secret: REGISTRY_PASSWORD
     commands:
       - echo "${REGISTRY_PASSWORD}" | docker login "${REGISTRY_HOSTPORT}" -u "${REGISTRY_USERNAME}" --password-stdin
       - docker build -t "${REGISTRY_HOSTPORT}/nxtgauge-db-migrate" -f Dockerfile.migrate .