diff --git a/tasks/docker-registry/task.yaml b/tasks/docker-registry/task.yaml
index 350d841..c86a626 100644
--- a/tasks/docker-registry/task.yaml
+++ b/tasks/docker-registry/task.yaml
@@ -74,26 +74,34 @@ spec:
         }
         EOF
 
+    - name: prepare-env
+      image: alpine
+      script: |
+        #!/bin/sh
+        set -e
+        echo "Preparing env vars..."
+        export PYPI_USERNAME=$(cat /workspace/pypi-auth/username)
+        export PYPI_PASSWORD=$(cat /workspace/pypi-auth/password)
+        echo "$PYPI_USERNAME" > /workspace/source/.pypi_user
+        echo "$PYPI_PASSWORD" > /workspace/source/.pypi_pass
+
     - name: kaniko-build
       image: bitnami/kaniko:1.23.2
       workingDir: /workspace/source
       env:
         - name: DOCKER_CONFIG
           value: /tekton/home/.docker
-      script: |
-        #!/bin/sh
-        set -e
-
-        PYPI_USERNAME=$(cat /workspace/pypi-auth/username)
-        PYPI_PASSWORD=$(cat /workspace/pypi-auth/password)
-
-        /kaniko/executor \
-          --dockerfile=$(params.subdirectory)/$(params.dockerfile) \
-          --context=$(params.subdirectory)/$(params.context) \
-          --destination=$(params.imageName):$(params.tag) \
-          --skip-tls-verify \
-          --reproducible \
-          --verbosity=info \
-          --build-arg PYPI_USERNAME=$PYPI_USERNAME \
-          --build-arg PYPI_PASSWORD=$PYPI_PASSWORD
+      command:
+        - /kaniko/executor
+      args:
+        - --dockerfile=$(params.subdirectory)/$(params.dockerfile)
+        - --context=$(params.subdirectory)/$(params.context)
+        - --destination=$(params.imageName):$(params.tag)
+        - --skip-tls-verify
+        - --reproducible
+        - --verbosity=info
+        - --build-arg
+        - PYPI_USERNAME=$(cat /workspace/source/.pypi_user)
+        - --build-arg
+        - PYPI_PASSWORD=$(cat /workspace/source/.pypi_pass)