diff --git a/.make/Makefile.deploy.prow b/.make/Makefile.deploy.prow
index 79746c2..c86e3bd 100644
--- a/.make/Makefile.deploy.prow
+++ b/.make/Makefile.deploy.prow
@@ -23,7 +23,7 @@ build-hook: update
 .PHONY: build-hook-image
 build-hook-image:
 	$(DOCKER) build --build-arg BINARY=hook -t $(REGISTRY)/$(IMG_REPO)/$(OC_PROJECT_NAME)-hook -f $(DEPLOY_DOCKERFILE) .
-	$(DOCKER) tag $(REGISTRY)/$(IMG_REPO)-hook $(REGISTRY)/$(IMG_REPO)/$(OC_PROJECT_NAME)-hook:$(TAG)
+	$(DOCKER) tag $(REGISTRY)/$(IMG_REPO)/$(OC_PROJECT_NAME)-hook $(REGISTRY)/$(IMG_REPO)/$(OC_PROJECT_NAME)-hook:$(TAG)
 
 .PHONY: push-hook-image
 push-hook-image: build-hook-image
@@ -57,7 +57,7 @@ deploy-plugins: build-plugin-images push-plugin-images
 build-plugin-images: $(BUILD_IMAGES)
 $(BUILD_IMAGES): build-%: %
 	$(DOCKER) build --build-arg BINARY=$< -t $(REGISTRY)/$(IMG_REPO)/$(OC_PROJECT_NAME)-$< -f $(DEPLOY_DOCKERFILE) .
-	$(DOCKER) tag $(REGISTRY)/$(IMG_REPO)/$< $(REGISTRY)/$(IMG_REPO)/$(OC_PROJECT_NAME)-$<:$(TAG)
+	$(DOCKER) tag $(REGISTRY)/$(IMG_REPO)/$(OC_PROJECT_NAME)-$< $(REGISTRY)/$(IMG_REPO)/$(OC_PROJECT_NAME)-$<:$(TAG)
 
 
 .PHONY: clean-plugin-images
diff --git a/Gopkg.lock b/Gopkg.lock
index a9801cb..c4db383 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -103,7 +103,7 @@
   branch = "master"
   name = "github.com/golang/lint"
   packages = ["."]
-  revision = "470b6b0bb3005eda157f0275e2e4895055396a81"
+  revision = "06c8688daad7faa9da5a0c2f163a3d14aac986ca"
 
 [[projects]]
   name = "github.com/golang/protobuf"
@@ -329,7 +329,7 @@
     "http2/hpack",
     "idna"
   ]
-  revision = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9"
+  revision = "ed29d75add3d7c4bf7ca65aac0c6df3d1420216f"
 
 [[projects]]
   branch = "master"
@@ -392,7 +392,7 @@
     "go/internal/gcimporter",
     "go/types/typeutil"
   ]
-  revision = "1c99e1239a0c8b0e59c34000995c4e319b7702ca"
+  revision = "ffe88906718454e356e61776b54256e873fc133b"
 
 [[projects]]
   name = "google.golang.org/appengine"
@@ -436,7 +436,7 @@
   branch = "master"
   name = "k8s.io/api"
   packages = ["core/v1"]
-  revision = "655e4e87cb5a855657ad325d1a615cf870870c9d"
+  revision = "5f0d8f067e3bc465077d0333e891450326a577a3"
 
 [[projects]]
   branch = "release-1.9"
diff --git a/cico_setup.sh b/cico_setup.sh
index 6b7b319..4cff187 100755
--- a/cico_setup.sh
+++ b/cico_setup.sh
@@ -9,12 +9,19 @@ set -e
 # Source environment variables of the jenkins slave
 # that might interest this worker.
 function load_jenkins_vars() {
-  if [ -e "jenkins-env" ]; then
-    cat jenkins-env \
-      | grep -E "(IMG_REPO_TAG_LEN|IMG_REPO_USERNAME|IMG_REPO_PASSWORD|JENKINS_URL|GIT_BRANCH|GIT_COMMIT|BUILD_NUMBER|ghprbSourceBranch|ghprbActualCommit|BUILD_URL|ghprbPullId)=" \
-      | sed 's/^/export /g' \
-      > ~/.jenkins-env
-    source ~/.jenkins-env
+  if [ -e "jenkins-env.json" ]; then
+    eval "$(./env-toolkit load -f jenkins-env.json \
+        DEVSHIFT_TAG_LEN \
+        QUAY_USERNAME \
+        QUAY_PASSWORD \
+        JENKINS_URL \
+        GIT_BRANCH \
+        GIT_COMMIT \
+        BUILD_NUMBER \
+        ghprbSourceBranch \
+        ghprbActualCommit \
+        BUILD_URL \
+        ghprbPullId)"
   fi
 }
 
@@ -58,8 +65,8 @@ function deploy() {
   fi
 
   # Login first
-  if [ -n "${IMG_REPO_USERNAME}" -a -n "${IMG_REPO_PASSWORD}" ]; then
-    docker login -u ${IMG_REPO_USERNAME} -p ${IMG_REPO_PASSWORD} ${REGISTRY}
+  if [ -n "${QUAY_USERNAME}" -a -n "${QUAY_PASSWORD}" ]; then
+    docker login -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} ${REGISTRY}
   else
     echo "Could not login, missing credentials for the registry"
   fi