diff --git a/.woodpecker.yml b/.woodpecker.yml
index aef88cb..5aefd8d 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,31 +1,31 @@
 steps:
-  docker-config:
-    name: Setup Docker Config for Harbor Auth
+  setup-auth:
+    name: Setup Docker Auth for Harbor
     image: alpine:3.19
     environment:
-      PULL_USERNAME:
+      PULL_USER:
         from_secret: DOCKER_PULL_BASE_IMAGES_USERNAME
-      PULL_PASSWORD:
+      PULL_PASS:
         from_secret: DOCKER_PULL_BASE_IMAGES_TOKEN
     commands:
       - mkdir -p /kaniko/.docker
       - |
-        cat > /kaniko/.docker/config.json <<'EOF'
+        AUTH=$(echo -n "${PULL_USER}:${PULL_PASS}" | base64 -w0)
+        cat > /kaniko/.docker/config.json <<EOF
         {
           "auths": {
             "harbor.dvirlabs.com": {
-              "username": "$PULL_USERNAME",
-              "password": "$PULL_PASSWORD"
+              "auth": "$AUTH"
             }
           }
         }
         EOF
-      - sed -i "s|\$PULL_USERNAME|$PULL_USERNAME|g" /kaniko/.docker/config.json
-      - sed -i "s|\$PULL_PASSWORD|$PULL_PASSWORD|g" /kaniko/.docker/config.json
 
   build-and-push:
     name: Build & Push Docker Image
     image: woodpeckerci/plugin-kaniko
+    depends_on:
+      - setup-auth
     when:
       branch: [ master, develop ]
       event: [ push, pull_request, tag ]