diff --git a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
index b8539a7c..6a411af6 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
@@ -31,10 +31,10 @@ class ImageBuilder {
       steps.log.info("ImageBuilder", "Authentication to ${registry}")
       switch(builderType) {
         case ImageBuilderTypes.DOCKER_IN_DOCKER:
-          steps.sh "docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} ${registry}"
+          steps.sh "docker login -u ${steps.env.DOCKER_USERNAME} -p ${steps.env.DOCKER_PASSWORD} ${registry}"
           break
         case ImageBuilderTypes.KANIKO:
-          def auth = "${DOCKER_USERNAME}:${DOCKER_PASSWORD}".bytes.encodeBase64().toString()
+          def auth = "${steps.env.DOCKER_USERNAME}:${steps.env.DOCKER_PASSWORD}".bytes.encodeBase64().toString()
           steps.writeFile file: '/kaniko/.docker/config.json', text: """{
             "auths": {
               "${registry}": {