diff --git a/jenkins-tp/jobs/builders/mcp-build-images-smoke.sh b/jenkins-tp/jobs/builders/mcp-build-images-smoke.sh
index 280182d..0c6a425 100644
--- a/jenkins-tp/jobs/builders/mcp-build-images-smoke.sh
+++ b/jenkins-tp/jobs/builders/mcp-build-images-smoke.sh
@@ -36,6 +36,12 @@ export HYPERKUBE_IMAGE_NAME="quay.io/coreos/hyperkube"
 export HYPERKUBE_IMAGE_TAG="v1.4.0_coreos.1"
 # etcd version
 export ETCD_IMAGE_TAG="v3.0.10"
+# set version of openstack
+if [ ${OS_VER} == "ocata" ];then
+    OS_RELEASE="master"
+else
+    OS_RELEASE="stable/newton"
+fi
 
 if [[ -z ${IMAGE_PATH} ]]; then
     echo "The IMAGE_PATH variable is not set!"
@@ -44,8 +50,8 @@ fi
 
 echo STARTED_TIME="$(date -u +'%Y-%m-%dT%H:%M:%S')" > ci_status_params.txt
 
-virtualenv $WORKSPACE/venv-fuel-ccp-tests
-source $WORKSPACE/venv-fuel-ccp-tests/bin/activate
+virtualenv ${WORKSPACE}/venv-fuel-ccp-tests
+source ${WORKSPACE}/venv-fuel-ccp-tests/bin/activate
 pushd fuel-ccp-tests
 pip install -r fuel_ccp_tests/requirements.txt
 pip install -U .
@@ -61,26 +67,31 @@ set -e
 
 #set tag dependent from test result
 if [[ ${SMOKE_STATUS} == 0 ]]; then
-    DOCKER_TAG="latest"
+    DOCKER_TAG=${OS_VER}
 else
-    DOCKER_TAG="unstable"
+    DOCKER_TAG="${OS_VER}-unstable"
 fi
 
-MASTER_IP=`awk '/kube_host/ {print $3}' $WORKSPACE/fuel-ccp-tests/${ENV_NAME}_k8s_deployed.ini`
+MASTER_IP=`awk '/kube_host/ {print $3}' ${WORKSPACE}/fuel-ccp-tests/${ENV_NAME}_k8s_deployed.ini`
 
-ssh-keygen -R $MASTER_IP
+ssh-keygen -R ${MASTER_IP}
 
 sshpass -p vagrant scp -o StrictHostKeyChecking=no vagrant@${MASTER_IP}:ccp.* .
 
-IMG=`sshpass -p vagrant ssh -o StrictHostKeyChecking=no vagrant@$MASTER_IP docker images --format "{{.Repository}}" | awk -F'/' -v search=/${IMAGES_NAMESPACE}/ '$0 ~ search {print $3}'`
+IMG=`sshpass -p vagrant ssh -o StrictHostKeyChecking=no vagrant@${MASTER_IP} docker images --format "{{.Repository}}" | awk -F'/' -v search=/${IMAGES_NAMESPACE}/ '$0 ~ search {print $3}'`
 
 # we need docker config file to authentication in remote repository
-sshpass -p vagrant ssh -o StrictHostKeyChecking=no vagrant@$MASTER_IP mkdir -p /home/vagrant/.docker/
+sshpass -p vagrant ssh -o StrictHostKeyChecking=no vagrant@${MASTER_IP} mkdir -p /home/vagrant/.docker/
 sshpass -p vagrant scp -o StrictHostKeyChecking=no /home/jenkins/.docker/config.json vagrant@${MASTER_IP}:~/.docker/
 
 for f in ${IMG}; do
-    sshpass  -p vagrant ssh -o StrictHostKeyChecking=no vagrant@$MASTER_IP \
+    sshpass  -p vagrant ssh -o StrictHostKeyChecking=no vagrant@${MASTER_IP} \
     "docker tag 127.0.0.1:31500/${IMAGES_NAMESPACE}/$f:latest ${DOCKER_REGISTRY}/${IMAGES_NAMESPACE}/${f}:${DOCKER_TAG} && docker push ${DOCKER_REGISTRY}/${IMAGES_NAMESPACE}/${f}:${DOCKER_TAG}"
+    if [ ${DOCKER_TAG} == "ocata" ]; then
+        sshpass  -p vagrant ssh -o StrictHostKeyChecking=no vagrant@${MASTER_IP} \
+        "docker tag 127.0.0.1:31500/${IMAGES_NAMESPACE}/${f}:latest ${DOCKER_REGISTRY}/${IMAGES_NAMESPACE}/${f}:latest \
+        && docker push ${DOCKER_REGISTRY}/${IMAGES_NAMESPACE}/${f}:latest"
+    fi
 done
 
 deactivate
diff --git a/jenkins-tp/jobs/mcp-build-images-smoke.yaml b/jenkins-tp/jobs/mcp-build-images-smoke.yaml
index cefb59c..d690b69 100644
--- a/jenkins-tp/jobs/mcp-build-images-smoke.yaml
+++ b/jenkins-tp/jobs/mcp-build-images-smoke.yaml
@@ -1,11 +1,12 @@
-- job:
-    name: 'mcp-build-images-smoke'
+- job-template:
+    name: 'build-{version}-images-smoke'
     builders:
       - inject:
           properties-content: |
             IMAGE_PATH=/home/jenkins/workspace/cloud-images/default-image.qcow2
+            OS_VER={version}
       - shell:
-          !include-raw builders/mcp-build-images-smoke.sh
+          !include-raw-escape builders/mcp-build-images-smoke.sh
     concurrent: false
     node: standard
     description: |
@@ -42,10 +43,18 @@
 
               set -xe
               export ENV_PREFIX="fuel-ccp-tests"
-              export ENV_NAME=${ENV_PREFIX}.${BUILD_NUMBER}
+              export ENV_NAME=$ENV_PREFIX.$BUILD_NUMBER
 
               source /home/jenkins/venv-fuel-devops-3.0/bin/activate
 
-              dos.py erase ${ENV_NAME}
+              dos.py erase $ENV_NAME
 
               deactivate
+
+- project:
+    name: smoke-build
+    version:
+      - newton
+      - ocata
+    jobs:
+      - build-{version}-images-smoke