diff --git a/.cico/setup.sh b/.cico/setup.sh
index 8ad25bd..2d04bc8 100755
--- a/.cico/setup.sh
+++ b/.cico/setup.sh
@@ -4,7 +4,8 @@
 #
 # This is automatically updated by fabric8-jenkins/jenkins-openshift-base
 # at merge time via a PR but you can always modify it manually for fun and giggles.
-BASE_IMAGE_VERSION="vc9cba3c"
+BASE_IMAGE_NAMESPACE='openshift/jenkins-2-centos7'
+BASE_IMAGE_VERSION="v4.0"
 
 set -ex
 
@@ -58,7 +59,7 @@ function build() {
     local snapshotImageName="fabric8/jenkins-openshift:SNAPSHOT-PR-${ghprbPullId}-${BUILD_ID}"
     local message="Good news @${ghprbPullAuthorLogin} snapshot Jenkins image is available. \`docker pull ${snapshotImageName}\`"
 
-    s2i build . fabric8/jenkins-openshift-base:${BASE_IMAGE_VERSION} ${snapshotImageName} --copy
+    s2i build . ${BASE_IMAGE_NAMESPACE}:${BASE_IMAGE_VERSION} ${snapshotImageName} --copy
 
     docker push ${snapshotImageName}
 
@@ -67,7 +68,7 @@ function build() {
 
 function deploy() {
     local newVersion="v$(git rev-parse --short ${GIT_COMMIT})"
-    s2i build . fabric8/jenkins-openshift-base:${BASE_IMAGE_VERSION} \
+    s2i build . ${BASE_IMAGE_NAMESPACE}:${BASE_IMAGE_VERSION} \
         fabric8/jenkins-openshift:${newVersion} --copy
 
     docker push fabric8/jenkins-openshift:${newVersion}
diff --git a/Jenkinsfile b/Jenkinsfile
index 5e20d17..42fcbd4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,8 @@ def repo = 'openshift-jenkins-s2i-config'
 def org = 'fabric8io'
 def project = org + '/' + repo
 def flow = new io.fabric8.Fabric8Commands()
-def baseImageVerion = "v0072490"
+def baseImageNameSpace = "openshift/jenkins-2-centos7"
+def baseImageVerion = "v4.0"
 def deploySnapshot = false
 def pipeline
 def snapshotImageName
@@ -18,7 +19,7 @@ dockerTemplate{
             snapshotImageName = "fabric8/jenkins-openshift:SNAPSHOT-${env.BRANCH_NAME}-${env.BUILD_NUMBER}"
             stage ('build'){
                 container('s2i') {
-                    sh "s2i build . fabric8/jenkins-openshift-base:${baseImageVerion} ${snapshotImageName} --copy"
+                    sh "s2i build . ${baseImageNameSpace}:${baseImageVerion} ${snapshotImageName} --copy"
                 }
             }
 
@@ -52,7 +53,7 @@ dockerTemplate{
 
             stage ('s2i build'){
                 container('s2i') {
-                    sh "s2i build . fabric8/jenkins-openshift-base:${baseImageVerion} fabric8/jenkins-openshift:${newVersion} --copy"
+                    sh "s2i build . ${baseImageNameSpace}:${baseImageVerion} fabric8/jenkins-openshift:${newVersion} --copy"
                 }
             }