diff --git a/deploy/ci/console-release.yml b/deploy/ci/console-release.yml
index c986cb9c43..90db437e0a 100644
--- a/deploy/ci/console-release.yml
+++ b/deploy/ci/console-release.yml
@@ -111,8 +111,10 @@ jobs:
       params:
         DOCKER_USERNAME: {{docker-username}}
         DOCKER_PASSWORD: {{docker-password}}
-        BASE_IMAGE: sle_12
+        BASE_IMAGE: {{staging-repo-base-image-tag}}
         STAGING_REPOSITORY: {{staging-repository}}
+        STAGING_REPOSITORY_USERNAME: {{staging-repository-username}}
+        STAGING_REPOSITORY_PASSWORD: {{staging-repository-password}}
     - put: helm-chart-values-sle
       params:
         file: helm-build/values.yaml-*
diff --git a/deploy/ci/tasks/release/build-helm.yml b/deploy/ci/tasks/release/build-helm.yml
index b3ee28b7bb..f15b4938cc 100644
--- a/deploy/ci/tasks/release/build-helm.yml
+++ b/deploy/ci/tasks/release/build-helm.yml
@@ -23,7 +23,9 @@ run:
       "insecure-registries":["${STAGING_REPOSITORY}"]
       }
       EOF
+      docker login -u ${STAGING_REPOSITORY_USERNAME} -p ${STAGING_REPOSITORY_PASSWORD} ${STAGING_REPOSITORY}
       fi
+
       source /docker-lib.sh
       start_docker
       ROOT_DIR=${PWD}
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index d92340360f..f2474832c6 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -8,7 +8,7 @@ DOCKER_ORG=splatform
 BASE_IMAGE_TAG=opensuse
 TAG=$(date -u +"%Y%m%dT%H%M%SZ")
 
-while getopts ":ho:r:t:dTclb" opt; do
+while getopts ":ho:r:t:dTclb:" opt; do
   case $opt in
     h)
       echo