diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6807ac8e..c9e7de7b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
           name: Build S2I Java
           command: |
               cd java/images/centos
-              docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+              docker login -u $DOCKER_USER -p $DOCKER_PASS
               docker build -t fabric8/s2i-java:latest .
               docker push fabric8/s2i-java:latest
   karaf-latest:
@@ -24,7 +24,7 @@ jobs:
           name: Build S2I Karaf
           command: |
               cd karaf/images/centos
-              docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+              docker login -u $DOCKER_USER -p $DOCKER_PASS
               docker build -t fabric8/s2i-karaf:latest .
               docker push fabric8/s2i-karaf:latest
   java-tag:
@@ -37,7 +37,7 @@ jobs:
           name: Build S2I Java for $CIRCLE_TAG
           command: |
               cd java/images/centos
-              docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+              docker login -u $DOCKER_USER -p $DOCKER_PASS
               docker build -t fabric8/s2i-java:${CIRCLE_TAG/#v/} .
               docker push fabric8/s2i-java:${CIRCLE_TAG/#v/}
               docker tag fabric8/s2i-java:${CIRCLE_TAG/#v/} fabric8/s2i-java:$(echo ${CIRCLE_TAG/#v/} | sed -e 's/\.[0-9][0-9]*$//')
@@ -52,7 +52,7 @@ jobs:
           name: Build S2I Karaf for $CIRCLE_TAG
           command: |
               cd karaf/images/centos
-              docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+              docker login -u $DOCKER_USER -p $DOCKER_PASS
               docker build -t fabric8/s2i-karaf:${CIRCLE_TAG/#v/} .
               docker push fabric8/s2i-karaf:${CIRCLE_TAG/#v/}
               docker tag fabric8/s2i-karaf:${CIRCLE_TAG/#v/} fabric8/s2i-karaf:$(echo ${CIRCLE_TAG/#v/} | sed -e 's/\.[0-9][0-9]*$//')