diff --git a/Dockerfile b/Dockerfile
index 3131901..4e3b491 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,8 +22,8 @@ RUN pip install $ARG_PIP_OPTS virtualenv \
 ENV PATH $VIRTUAL_ENV/bin:$PATH
 
 RUN pip install $ARG_PIP_OPTS \
-    "devpi-client==2.6.3" \
-    "devpi-web==3.1.0" \
+    "devpi-client==2.6.4" \
+    "devpi-web==3.1.1" \
     "devpi-server==$DEVPI_VERSION"
 
 EXPOSE 3141
diff --git a/build.sh b/build.sh
index e3d91ad..2b0f53f 100755
--- a/build.sh
+++ b/build.sh
@@ -7,9 +7,32 @@
 set -e
 set -x
 set -a
+: ${DOCKER_USE_HUB:="0"}
 
 DATE=`date +%Y.%m.%d`
-DOCKER_DEVPI_VERSION=4.0.0
+DOCKER_DEVPI_VERSION=4.1.0
+
+
+ci_docker_login() {
+    info 'Docker login'
+
+    if [ -z ${DOCKER_EMAIL+x} ]; then
+        DOCKER_EMAIL=${bamboo_DOCKER_EMAIL}
+    fi
+    if [ -z ${DOCKER_USERNAME+x} ]; then
+        DOCKER_USERNAME=${bamboo_DOCKER_USERNAME}
+    fi
+    if [ -z ${DOCKER_PASSWORD+x} ]; then
+        DOCKER_PASSWORD=${bamboo_DOCKER_PASSWORD}
+    fi
+
+    docker login -e "${DOCKER_EMAIL}" -u ${DOCKER_USERNAME} --password="${DOCKER_PASSWORD}"
+    success "Docker login"
+}
+
+
+# warm up cache
+docker pull muccg/devpi:latest || true
 
 docker-compose build devpi
 docker inspect muccg/devpi:latest
@@ -17,6 +40,9 @@ docker inspect muccg/devpi:latest
 docker tag muccg/devpi:latest muccg/devpi:latest-${DATE}
 docker tag muccg/devpi:latest muccg/devpi:${DOCKER_DEVPI_VERSION}
 
-docker push muccg/devpi:latest
-docker push muccg/devpi:latest-${DATE}
-docker push muccg/devpi:${DOCKER_DEVPI_VERSION}
+if [ ${DOCKER_USE_HUB} = "1" ]; then
+    ci_docker_login
+    docker push muccg/devpi:latest
+    docker push muccg/devpi:latest-${DATE}
+    docker push muccg/devpi:${DOCKER_DEVPI_VERSION}
+fi