diff --git a/.travis.yml b/.travis.yml
index e4ee857dc5..eea4419292 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ jobs:
       install: true
       language: java
       script:
-        - _BUILD_DOCKER_IMAGE="lifescience/cloud-pipeline:python2.7-centos6" ./gradlew -PbuildNumber=${TRAVIS_BUILD_NUMBER}.${TRAVIS_COMMIT} -Pprofile=release pipe-cli:buildLinux --no-daemon
+        - _BUILD_DOCKER_IMAGE="${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:python2.7-centos6" ./gradlew -PbuildNumber=${TRAVIS_BUILD_NUMBER}.${TRAVIS_COMMIT} -Pprofile=release pipe-cli:buildLinux --no-daemon
         - tar -zcf cli-linux-el6.tgz pipe-cli/dist
       after_success:
         - aws s3 mv cli-linux-el6.tgz s3://cloud-pipeline-oss-builds/temp/${TRAVIS_BUILD_NUMBER}/
diff --git a/cloud-pipeline-webdav-client/build_win.sh b/cloud-pipeline-webdav-client/build_win.sh
index 93738748da..71dd6a480c 100755
--- a/cloud-pipeline-webdav-client/build_win.sh
+++ b/cloud-pipeline-webdav-client/build_win.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CP_NODE_WINE_DOCKER="lifescience/cloud-pipeline:node-wine"
+CP_NODE_WINE_DOCKER="${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:node-wine"
 docker pull $CP_NODE_WINE_DOCKER
 if [ $? -ne 0 ]; then
     echo "Unable to pull $CP_NODE_WINE_DOCKER image, it will be rebuilt"
diff --git a/deploy/appveyor/appveyor_pack_dist.sh b/deploy/appveyor/appveyor_pack_dist.sh
index c475ad65d9..af30596056 100644
--- a/deploy/appveyor/appveyor_pack_dist.sh
+++ b/deploy/appveyor/appveyor_pack_dist.sh
@@ -19,7 +19,7 @@ rm -rf ${API_STATIC_PATH}/*
 rm -rf build/install/dist/*
 
 
-_BUILD_DOCKER_IMAGE="lifescience/cloud-pipeline:python2.7-centos6" ./gradlew -PbuildNumber=${APPVEYOR_BUILD_NUMBER}.${APPVEYOR_REPO_COMMIT} -Pprofile=release pipe-cli:buildLinux --no-daemon -x :pipe-cli:test
+_BUILD_DOCKER_IMAGE="${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:python2.7-centos6" ./gradlew -PbuildNumber=${APPVEYOR_BUILD_NUMBER}.${APPVEYOR_REPO_COMMIT} -Pprofile=release pipe-cli:buildLinux --no-daemon -x :pipe-cli:test
 mv pipe-cli/dist/dist-file/pipe ${API_STATIC_PATH}/pipe-el6
 mv pipe-cli/dist/dist-folder/pipe.tar.gz ${API_STATIC_PATH}/pipe-el6.tar.gz
 
diff --git a/deploy/contents/install/app/install.sh b/deploy/contents/install/app/install.sh
index 2110879363..08c8a65ed8 100644
--- a/deploy/contents/install/app/install.sh
+++ b/deploy/contents/install/app/install.sh
@@ -266,14 +266,19 @@ echo
 ##########
 print_ok "[Setting up docker distr registry credentials]"
 
+if [ -z "$CP_DOCKER_DIST_SRV" ]; then
+    print_warn "CP_DOCKER_DIST_SRV is not set, https://index.docker.io/v1/ is used to authenticate against docker dist registry and create a kube secret"
+    export CP_DOCKER_DIST_SRV="https://index.docker.io/v1/"
+fi
+
+if [ "${$CP_DOCKER_DIST_SRV: -1}" != "/" ]; then
+    print_warn "CP_DOCKER_DIST_SRV doesn't end with '/': ${CP_DOCKER_DIST_SRV}, will additionally add it."
+    export CP_DOCKER_DIST_SRV="${CP_DOCKER_DIST_SRV}/"
+fi
+
 if [ -z "$CP_DOCKER_DIST_USER" ] || [ -z "$CP_DOCKER_DIST_PASS" ]; then
     print_warn "CP_DOCKER_DIST_USER or CP_DOCKER_DIST_PASS is not set, proceeding without registry authentication"
 else
-    if [ -z "$CP_DOCKER_DIST_SRV" ]; then
-        print_warn "CP_DOCKER_DIST_SRV is not set, https://index.docker.io/v1/ is used to authenticate against docker dist registry and create a kube secret"
-        export CP_DOCKER_DIST_SRV="https://index.docker.io/v1/"
-    fi
-
     print_info "Logging docker into $CP_DOCKER_DIST_SRV as $CP_DOCKER_DIST_USER"
     docker login "$CP_DOCKER_DIST_SRV" \
                 -u "$CP_DOCKER_DIST_USER" \
diff --git a/deploy/contents/k8s/cp-api-srv/cp-api-srv-dpl.yaml b/deploy/contents/k8s/cp-api-srv/cp-api-srv-dpl.yaml
index 55a415d760..8b7448ce9e 100644
--- a/deploy/contents/k8s/cp-api-srv/cp-api-srv-dpl.yaml
+++ b/deploy/contents/k8s/cp-api-srv/cp-api-srv-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-api-srv-leader-elector
-          image: lifescience/cloud-pipeline:leader-elector-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:leader-elector-$CP_VERSION
           imagePullPolicy: "Always"
           securityContext:
             privileged: true
@@ -37,7 +37,7 @@ spec:
                 name: cp-config-global
           
         - name: cp-api-srv
-          image: lifescience/cloud-pipeline:api-srv-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:api-srv-$CP_VERSION
           imagePullPolicy: "Always"
           securityContext:
             privileged: true
diff --git a/deploy/contents/k8s/cp-billing-srv/cp-billing-srv-dpl.yaml b/deploy/contents/k8s/cp-billing-srv/cp-billing-srv-dpl.yaml
index 1327744dac..ed956361d5 100644
--- a/deploy/contents/k8s/cp-billing-srv/cp-billing-srv-dpl.yaml
+++ b/deploy/contents/k8s/cp-billing-srv/cp-billing-srv-dpl.yaml
@@ -19,7 +19,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: cp-billing-srv
-          image: lifescience/cloud-pipeline:billing-srv-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:billing-srv-$CP_VERSION
           imagePullPolicy: "Always"
           command: ["/init"]
           envFrom:
diff --git a/deploy/contents/k8s/cp-bkp-worker/cp-bkp-worker-dpl.yaml b/deploy/contents/k8s/cp-bkp-worker/cp-bkp-worker-dpl.yaml
index 08899e94b8..ae4dd5132b 100644
--- a/deploy/contents/k8s/cp-bkp-worker/cp-bkp-worker-dpl.yaml
+++ b/deploy/contents/k8s/cp-bkp-worker/cp-bkp-worker-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-bkp-worker-$CP_BKP_SERVICE_NAME
-          image: lifescience/cloud-pipeline:cp-bkp-worker-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:cp-bkp-worker-$CP_VERSION
           imagePullPolicy: "Always"
           envFrom:
             - configMapRef:
diff --git a/deploy/contents/k8s/cp-clair/cp-clair-dpl.yaml b/deploy/contents/k8s/cp-clair/cp-clair-dpl.yaml
index b000d8dd4f..b48b1096e7 100644
--- a/deploy/contents/k8s/cp-clair/cp-clair-dpl.yaml
+++ b/deploy/contents/k8s/cp-clair/cp-clair-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-clair
-          image: lifescience/cloud-pipeline:clair-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:clair-$CP_VERSION
           imagePullPolicy: "Always"
           ports:
             - containerPort: 8080
diff --git a/deploy/contents/k8s/cp-dav/cp-dav-dpl.yaml b/deploy/contents/k8s/cp-dav/cp-dav-dpl.yaml
index 9be0d29a1f..2067e74756 100644
--- a/deploy/contents/k8s/cp-dav/cp-dav-dpl.yaml
+++ b/deploy/contents/k8s/cp-dav/cp-dav-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-dav
-          image: lifescience/cloud-pipeline:dav-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:dav-$CP_VERSION
           imagePullPolicy: "Always"
           securityContext:
             privileged: true
diff --git a/deploy/contents/k8s/cp-docker-comp/cp-docker-comp-dpl.yaml b/deploy/contents/k8s/cp-docker-comp/cp-docker-comp-dpl.yaml
index b94b431c71..97f1fdce96 100644
--- a/deploy/contents/k8s/cp-docker-comp/cp-docker-comp-dpl.yaml
+++ b/deploy/contents/k8s/cp-docker-comp/cp-docker-comp-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-docker-comp
-          image: lifescience/cloud-pipeline:docker-comp-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:docker-comp-$CP_VERSION
           imagePullPolicy: "Always"
           command: ["/init"]
           ports:
diff --git a/deploy/contents/k8s/cp-docker-registry/cp-docker-registry-dpl.yaml b/deploy/contents/k8s/cp-docker-registry/cp-docker-registry-dpl.yaml
index 5d2cd52480..64b36c7253 100644
--- a/deploy/contents/k8s/cp-docker-registry/cp-docker-registry-dpl.yaml
+++ b/deploy/contents/k8s/cp-docker-registry/cp-docker-registry-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-docker-registry
-          image: lifescience/cloud-pipeline:registry-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:registry-$CP_VERSION
           imagePullPolicy: "Always"
           ports:
             - containerPort: 443
diff --git a/deploy/contents/k8s/cp-edge/cp-edge-dpl.yaml b/deploy/contents/k8s/cp-edge/cp-edge-dpl.yaml
index 283781a507..64078c1b0a 100644
--- a/deploy/contents/k8s/cp-edge/cp-edge-dpl.yaml
+++ b/deploy/contents/k8s/cp-edge/cp-edge-dpl.yaml
@@ -19,7 +19,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-edge
-          image: lifescience/cloud-pipeline:edge-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:edge-$CP_VERSION
           imagePullPolicy: "Always"
           command: ["/init"]
           env:
diff --git a/deploy/contents/k8s/cp-git-sync/cp-git-sync-dpl.yaml b/deploy/contents/k8s/cp-git-sync/cp-git-sync-dpl.yaml
index e2a5936132..11150fed4d 100644
--- a/deploy/contents/k8s/cp-git-sync/cp-git-sync-dpl.yaml
+++ b/deploy/contents/k8s/cp-git-sync/cp-git-sync-dpl.yaml
@@ -19,7 +19,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-git-sync
-          image: lifescience/cloud-pipeline:api-srv-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:api-srv-$CP_VERSION
           imagePullPolicy: "Always"
           command: ["/init-git-sync", "https://$(CP_API_SRV_INTERNAL_HOST):$(CP_API_SRV_INTERNAL_PORT)/pipeline/restapi/", "$(CP_API_JWT_ADMIN)"]
           envFrom:
diff --git a/deploy/contents/k8s/cp-git/cp-git-dpl.yaml b/deploy/contents/k8s/cp-git/cp-git-dpl.yaml
index e7b5cca8ee..30894f460f 100644
--- a/deploy/contents/k8s/cp-git/cp-git-dpl.yaml
+++ b/deploy/contents/k8s/cp-git/cp-git-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-git
-          image: lifescience/cloud-pipeline:git-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:git-$CP_VERSION
           imagePullPolicy: "Always"
           ports:
             - containerPort: ${CP_GITLAB_INTERNAL_PORT}
diff --git a/deploy/contents/k8s/cp-idp/cp-idp-pod.yaml b/deploy/contents/k8s/cp-idp/cp-idp-pod.yaml
index 52edc719b4..fe1fc83637 100644
--- a/deploy/contents/k8s/cp-idp/cp-idp-pod.yaml
+++ b/deploy/contents/k8s/cp-idp/cp-idp-pod.yaml
@@ -13,7 +13,7 @@ spec:
     effect: NoSchedule
   containers:
     - name: cp-idp
-      image: lifescience/cloud-pipeline:idp-$CP_VERSION
+      image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:idp-$CP_VERSION
       imagePullPolicy: "Always"
       command: ["/init"]
       ports:
diff --git a/deploy/contents/k8s/cp-node-logger/cp-node-logger-ds.yaml b/deploy/contents/k8s/cp-node-logger/cp-node-logger-ds.yaml
index bfc6f6d662..8330213cdd 100644
--- a/deploy/contents/k8s/cp-node-logger/cp-node-logger-ds.yaml
+++ b/deploy/contents/k8s/cp-node-logger/cp-node-logger-ds.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: cp-node-logger
-        image: lifescience/cloud-pipeline:node-logger-$CP_VERSION
+        image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:node-logger-$CP_VERSION
         imagePullPolicy: "IfNotPresent"
         volumeMounts:
         - name: kubelet-log
diff --git a/deploy/contents/k8s/cp-notifier/cp-notifier-dpl.yaml b/deploy/contents/k8s/cp-notifier/cp-notifier-dpl.yaml
index e85753e07d..d1192c0437 100644
--- a/deploy/contents/k8s/cp-notifier/cp-notifier-dpl.yaml
+++ b/deploy/contents/k8s/cp-notifier/cp-notifier-dpl.yaml
@@ -19,7 +19,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-notifier
-          image: lifescience/cloud-pipeline:notifier-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:notifier-$CP_VERSION
           imagePullPolicy: "Always"
           command: ["/init"]
           envFrom:
diff --git a/deploy/contents/k8s/cp-search/cp-search-elk-dpl.yaml b/deploy/contents/k8s/cp-search/cp-search-elk-dpl.yaml
index bd81c79f83..31afbb94f9 100644
--- a/deploy/contents/k8s/cp-search/cp-search-elk-dpl.yaml
+++ b/deploy/contents/k8s/cp-search/cp-search-elk-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-search-elk
-          image: lifescience/cloud-pipeline:search-elk-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:search-elk-$CP_VERSION
           securityContext:
             privileged: true
           imagePullPolicy: "IfNotPresent"
diff --git a/deploy/contents/k8s/cp-search/cp-search-srv-dpl.yaml b/deploy/contents/k8s/cp-search/cp-search-srv-dpl.yaml
index 5a5877af3f..6ae26a957d 100644
--- a/deploy/contents/k8s/cp-search/cp-search-srv-dpl.yaml
+++ b/deploy/contents/k8s/cp-search/cp-search-srv-dpl.yaml
@@ -19,7 +19,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-search-srv
-          image: lifescience/cloud-pipeline:search-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:search-$CP_VERSION
           imagePullPolicy: "Always"
           securityContext:
             privileged: true
diff --git a/deploy/contents/k8s/cp-search/cp-search-srv-nfs-only-dpl.yaml b/deploy/contents/k8s/cp-search/cp-search-srv-nfs-only-dpl.yaml
index 600d994c26..549b741e3e 100644
--- a/deploy/contents/k8s/cp-search/cp-search-srv-nfs-only-dpl.yaml
+++ b/deploy/contents/k8s/cp-search/cp-search-srv-nfs-only-dpl.yaml
@@ -19,7 +19,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: cp-search-srv
-          image: lifescience/cloud-pipeline:search-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:search-$CP_VERSION
           imagePullPolicy: "Always"
           securityContext:
             privileged: true
diff --git a/deploy/contents/k8s/cp-sensitive-proxy/cp-sensitive-proxy-dpl.yaml b/deploy/contents/k8s/cp-sensitive-proxy/cp-sensitive-proxy-dpl.yaml
index 5d83686cfe..0a32659274 100644
--- a/deploy/contents/k8s/cp-sensitive-proxy/cp-sensitive-proxy-dpl.yaml
+++ b/deploy/contents/k8s/cp-sensitive-proxy/cp-sensitive-proxy-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-sensitive-proxy
-          image: lifescience/cloud-pipeline:tinyproxy-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:tinyproxy-$CP_VERSION
           imagePullPolicy: "IfNotPresent"
           command: ["/init"]
           env:
diff --git a/deploy/contents/k8s/cp-share-srv/cp-share-srv-dpl.yaml b/deploy/contents/k8s/cp-share-srv/cp-share-srv-dpl.yaml
index ec08a6cd3c..9106444ec9 100644
--- a/deploy/contents/k8s/cp-share-srv/cp-share-srv-dpl.yaml
+++ b/deploy/contents/k8s/cp-share-srv/cp-share-srv-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-share-srv
-          image: lifescience/cloud-pipeline:share-srv-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:share-srv-$CP_VERSION
           imagePullPolicy: "Always"
           securityContext:
             privileged: true
diff --git a/deploy/contents/k8s/cp-tinyproxy/cp-tinyproxy-dpl.yaml b/deploy/contents/k8s/cp-tinyproxy/cp-tinyproxy-dpl.yaml
index c478e84ccd..04c2c1f127 100644
--- a/deploy/contents/k8s/cp-tinyproxy/cp-tinyproxy-dpl.yaml
+++ b/deploy/contents/k8s/cp-tinyproxy/cp-tinyproxy-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-tinyproxy
-          image: lifescience/cloud-pipeline:tinyproxy-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:tinyproxy-$CP_VERSION
           imagePullPolicy: "IfNotPresent"
           command: ["/init"]
           envFrom:
diff --git a/deploy/contents/k8s/cp-vm-monitor/cp-vm-monitor-dpl.yaml b/deploy/contents/k8s/cp-vm-monitor/cp-vm-monitor-dpl.yaml
index e27e9302c7..92dbdccb1c 100644
--- a/deploy/contents/k8s/cp-vm-monitor/cp-vm-monitor-dpl.yaml
+++ b/deploy/contents/k8s/cp-vm-monitor/cp-vm-monitor-dpl.yaml
@@ -18,7 +18,7 @@ spec:
         effect: NoSchedule
       containers:
         - name: cp-vm-monitor
-          image: lifescience/cloud-pipeline:vm-monitor-$CP_VERSION
+          image: ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:vm-monitor-$CP_VERSION
           imagePullPolicy: "Always"
           securityContext:
             privileged: true
diff --git a/deploy/docker/build-dockers.sh b/deploy/docker/build-dockers.sh
index 3f00ebafcb..ac8e77413b 100644
--- a/deploy/docker/build-dockers.sh
+++ b/deploy/docker/build-dockers.sh
@@ -95,20 +95,30 @@ if [ -z "$DOCKERS_VERSION" ]; then
     DOCKERS_VERSION="latest"
 fi
 
+if [ -z "$CP_DOCKER_DIST_SRV" ]; then
+    echo "CP_DOCKER_DIST_SRV is not set, https://index.docker.io/v1/ is used to authenticate against docker dist registry and create a kube secret"
+    export CP_DOCKER_DIST_SRV="https://index.docker.io/v1/"
+fi
+
+if [ "${$CP_DOCKER_DIST_SRV: -1}" != "/" ]; then
+    echo "CP_DOCKER_DIST_SRV doesn't end with '/': ${CP_DOCKER_DIST_SRV}, will additionally add it."
+    export CP_DOCKER_DIST_SRV="${CP_DOCKER_DIST_SRV}/"
+fi
+
 if [ -z "$CP_DOCKER_DIST_USER" ] || [ -z "$CP_DOCKER_DIST_PASS" ]; then
     echo "CP_DOCKER_DIST_USER or CP_DOCKER_DIST_PASS is not set, proceeding without registry authentication"
 else
-    docker login -u $CP_DOCKER_DIST_USER -p $CP_DOCKER_DIST_PASS
+    docker login ${CP_DOCKER_DIST_SRV} -u $CP_DOCKER_DIST_USER -p $CP_DOCKER_DIST_PASS
     if [ $? -ne 0 ]; then
         echo "Error occured while logging into the distr docker regsitry, exiting"
         exit 1
     fi
 fi
 
-export CP_DIST_REPO_NAME=${CP_DIST_REPO_NAME:-"$CP_DOCKER_DIST_USER/cloud-pipeline"}
+export CP_DIST_REPO_NAME=${CP_DIST_REPO_NAME:-"${CP_DOCKER_DIST_SRV}${CP_DOCKER_DIST_USER}/cloud-pipeline"}
 
 if [ -z "$CP_DIST_REPO_NAME" ]; then
-    CP_DIST_REPO_NAME="lifescience/cloud-pipeline"
+    CP_DIST_REPO_NAME="${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline"
 fi
 
 ########################
diff --git a/deploy/docker/cp-api-srv/Dockerfile b/deploy/docker/cp-api-srv/Dockerfile
index c823b5d620..89521cde7e 100644
--- a/deploy/docker/cp-api-srv/Dockerfile
+++ b/deploy/docker/cp-api-srv/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # docker build . \
-#   -t lifescience/cloud-pipeline:api-srv-latest \
+#   -t ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:api-srv-latest \
 #   --build-arg CP_API_DIST_URL="https://..." \
 #   --build-arg OPENSSL_DIST_URL="https://..." \
 #   --build-arg OSSLSIGNCODE_DIST_URL="https://..."
diff --git a/deploy/docker/cp-share-srv/Dockerfile b/deploy/docker/cp-share-srv/Dockerfile
index 3db12f5c75..d83a6a2687 100644
--- a/deploy/docker/cp-share-srv/Dockerfile
+++ b/deploy/docker/cp-share-srv/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # docker build . \
-#   -t lifescience/cloud-pipeline:share-srv-latest \
+#   -t ${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:share-srv-latest \
 #   --build-arg CP_API_DIST_URL="https://..."
 
 FROM centos:7
diff --git a/deploy/jenkins/jenkins-jobs/build-pipectl/build-pipectl.sh b/deploy/jenkins/jenkins-jobs/build-pipectl/build-pipectl.sh
index 7f6128f4a1..114a998bbd 100644
--- a/deploy/jenkins/jenkins-jobs/build-pipectl/build-pipectl.sh
+++ b/deploy/jenkins/jenkins-jobs/build-pipectl/build-pipectl.sh
@@ -21,6 +21,7 @@ export CP_VERSION_FULL="${dist_major}.${dist_minor}.${dist_patch}.${dist_build}.
 export CP_API_DIST_URL="$API_DIST_URL"
 export CP_PIPECTL_DIST_FILE_NAME="pipectl.$CP_VERSION_FULL"
 export CP_PIPECTL_DIST="$WORKSPACE/build/$CP_PIPECTL_DIST_FILE_NAME"
+export CP_DOCKER_DIST_SRV=quay.io/
 
 bash build.sh -o $CP_PIPECTL_DIST \
               -p $WORKSPACE/cloud-pipeline/workflows/pipe-templates/__SYSTEM/data_loader \
diff --git a/deploy/jenkins/jenkins-jobs/deploy-dev-aws/run-pipectl.sh b/deploy/jenkins/jenkins-jobs/deploy-dev-aws/run-pipectl.sh
index 61bb5347d5..fdfb13e81d 100644
--- a/deploy/jenkins/jenkins-jobs/deploy-dev-aws/run-pipectl.sh
+++ b/deploy/jenkins/jenkins-jobs/deploy-dev-aws/run-pipectl.sh
@@ -24,8 +24,12 @@ if ! kubectl version &> /dev/null || ! kubectl get po 2>/dev/null | grep -q cp-a
     unset _ERASE_DATA
 fi
 
+#Export docker registry where all containers are stored
+export CP_DOCKER_DIST_SRV=${CP_DOCKER_DIST_SRV}
+
 sudo chmod +x $DEPLOY_DIR/pipectl && \
 sudo -E $DEPLOY_DIR/pipectl install \
+    -env CP_DOCKER_DIST_SRV=${CP_DOCKER_DIST_SRV} \
     -env CP_AWS_KMS_ARN="$CP_AWS_KMS_ARN" \
     -env CP_AWS_ACCESS_KEY_ID="$CP_AWS_ACCESS_KEY_ID" \
     -env CP_HA_DEPLOY_ENABLED="${CP_AWS_HA_ENABLED:-false}" \
diff --git a/deploy/jenkins/jenkins-jobs/deploy-dev-az/run-pipectl.sh b/deploy/jenkins/jenkins-jobs/deploy-dev-az/run-pipectl.sh
index cf425a0f77..5d88d665b5 100644
--- a/deploy/jenkins/jenkins-jobs/deploy-dev-az/run-pipectl.sh
+++ b/deploy/jenkins/jenkins-jobs/deploy-dev-az/run-pipectl.sh
@@ -48,6 +48,9 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+#Export docker registry where all containers are stored
+export CP_DOCKER_DIST_SRV=${CP_DOCKER_DIST_SRV}
+
 # Grab pipectl binary
 wget -q "$PIPECTL_DIST_URL" -O "${DEPLOY_DIR}/pipectl"
 if [ $? -ne 0 ]; then
@@ -61,6 +64,7 @@ chmod +x "${DEPLOY_DIR}/pipectl"
 # $CP_AZURE_KUBE_MASTER_DOCKER_PATH and $CP_AZURE_KUBE_MASTER_ETCD_HOST_PATH
 # This allows to overcome disk I/O issues with a single drive
 ${DEPLOY_DIR}/pipectl install \
+                      -env CP_DOCKER_DIST_SRV=${CP_DOCKER_DIST_SRV} \
                       -env CP_CLUSTER_SSH_KEY="${DOLLAR}{AZURE_SSH_KEY_S3_LOCAL}" \
                       -env CP_CLUSTER_SSH_PUB="${DOLLAR}{AZURE_SSH_PUB_S3_LOCAL}" \
                       -env CP_CLOUD_CREDENTIALS_FILE="${DOLLAR}{AZURE_JSON_S3_LOCAL}" \
diff --git a/deploy/jenkins/run-jenkins.env b/deploy/jenkins/run-jenkins.env
index b51495bd7a..d9add01643 100644
--- a/deploy/jenkins/run-jenkins.env
+++ b/deploy/jenkins/run-jenkins.env
@@ -31,7 +31,8 @@ JENKINS_PORT=
 JENKINS_HOME=
 JENKINS_ENV=
 
-# Dockerhup setup
+# Dockerhub setup
+CP_DOCKER_DIST_SRV=
 DOCKER_USER=
 DOCKER_PASS=
 
diff --git a/pipe-cli/build_windows.sh b/pipe-cli/build_windows.sh
index cfb4e92977..ecfd2b8786 100644
--- a/pipe-cli/build_windows.sh
+++ b/pipe-cli/build_windows.sh
@@ -17,7 +17,7 @@
 # Step 1: Build NTLM APS with Python 2
 #######################################
 
-CP_PYINSTALL_WIN32_PY2_DOCKER="lifescience/cloud-pipeline:pyinstaller-win32-py2"
+CP_PYINSTALL_WIN32_PY2_DOCKER="${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:pyinstaller-win32-py2"
 docker pull $CP_PYINSTALL_WIN32_PY2_DOCKER
 if [ $? -ne 0 ]; then
     echo "Unable to pull $CP_PYINSTALL_WIN32_PY2_DOCKER image, it will be rebuilt"
@@ -67,7 +67,7 @@ rm -f $_BUILD_SCRIPT_NAME
 # Step 2: pipe CLI
 #######################################
 
-CP_PYINSTALL_WIN64_DOCKER="lifescience/cloud-pipeline:pyinstaller-win64"
+CP_PYINSTALL_WIN64_DOCKER="${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:pyinstaller-win64"
 docker pull $CP_PYINSTALL_WIN64_DOCKER
 if [ $? -ne 0 ]; then
     echo "Unable to pull $CP_PYINSTALL_WIN64_DOCKER image, it will be rebuilt"
diff --git a/pipe-cli/docker/centos6/Dockerfile b/pipe-cli/docker/centos6/Dockerfile
index 957ee057bf..5f9f0c1841 100644
--- a/pipe-cli/docker/centos6/Dockerfile
+++ b/pipe-cli/docker/centos6/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Used to build "lifescience/cloud-pipeline:python2.7-centos6" for the el6 pipe distribution
+# Used to build "${CP_DOCKER_DIST_SRV}lifescience/cloud-pipeline:python2.7-centos6" for the el6 pipe distribution
 FROM centos:6
 RUN yum install gcc \
                 openssl-devel \