diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 81497c6..1194dce 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -38,3 +38,4 @@
     linux_system_repo_mcp_glusterfs_version_number: "3.8"
     linux_system_repo_mcp_saltstack_version_number: "${_param:salt_version}"
     linux_system_repo_mcp_ceph_codename: luminous
+    linux_repo_contrail_component: oc40
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 03082ac..a73b8ad 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -203,7 +203,7 @@
               description: Enable if you need to keep container after the test and debug
             IMAGE:
               type: string
-              default: 'cvp-sanity-checks'
+              default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:apt_mk_version}"
               description: Docker image with tests and all pip dependecies to use for testing
             SALT_MASTER_URL:
               type: string
@@ -222,7 +222,7 @@
               description: e.g. skipped_nodes=nal01.local.com,ntw01.local.com
             TESTS_SET:
               type: string
-              default: "cvp-sanity-checks/cvp_checks/tests/"
+              default: "cvp_checks/tests/"
               description: "Leave as is for full run or add a filename, e.g. _default_path_/test_mtu.py"
             PROXY:
               type: string
@@ -241,6 +241,7 @@
           scm:
             type: git
             url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            branch: "${_param:jenkins_pipelines_branch}"
             credentials: "gerrit"
             script: cvp-func.groovy
           param:
@@ -304,6 +305,7 @@
           scm:
             type: git
             url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            branch: "${_param:jenkins_pipelines_branch}"
             credentials: "gerrit"
             script: cvp-ha.groovy
           param:
@@ -372,6 +374,7 @@
           scm:
             type: git
             url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            branch: "${_param:jenkins_pipelines_branch}"
             credentials: "gerrit"
             script: cvp-perf.groovy
           param:
@@ -446,7 +449,7 @@
             PROXY:
               type: string
               default: ""
-              description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
+              description: "Proxy address to use to access the Internet."
         cvp-spt:
           type: workflow-scm
           name: cvp-spt
@@ -470,7 +473,7 @@
               description: Enable if you need to keep container after the test and debug
             IMAGE:
               type: string
-              default: 'cvp-spt'
+              default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-spt:${_param:apt_mk_version}"
               description: Docker image with tests and all pip dependecies to use for testing
             SALT_MASTER_URL:
               type: string
@@ -486,10 +489,10 @@
             TESTS_SETTINGS:
               type: string
               default: ""
-              description: "Additional environment variables to export"
+              description: "Additional environment variables to export, e.g. image_name, networks, HW_NODES"
             TESTS_SET:
               type: string
-              default: "cvp-spt/cvp_spt/tests/"
+              default: "cvp_spt/tests/"
               description: "Leave as is for full run or add a filename, e.g. _default_path_/test_glance.py"
             PROXY:
               type: string
diff --git a/keystone/client/v3/service/octavia.yml b/keystone/client/v3/service/octavia.yml
index 56de95b..c02a6b8 100644
--- a/keystone/client/v3/service/octavia.yml
+++ b/keystone/client/v3/service/octavia.yml
@@ -8,18 +8,8 @@
     octavia_service_protocol: http
   keystone:
     client:
-      server:
-        identity:
-          octavia:
-            api_version: 3
-        octavia_identity:
-          admin:
-            api_version: ''
-            user_domain_name: 'Default'
-            project_domain_name: 'Default'
       resources:
         v3:
-          cloud_name: 'octavia_identity'
           roles:
             global_load_balancer_member:
               name: load-balancer_member
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 8028f51..d2f597a 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -7,6 +7,7 @@
     kubernetes_hyperkube_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
     kubernetes_contrail_cni_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
     kubernetes_contrail_network_controller_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes/contrail-integration
+    kubernetes_contrail_registry: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}
     kubernetes_netchecker_agent_repo: mirantis
     kubernetes_netchecker_server_repo: mirantis
     kubernetes_virtlet_repo: mirantis
@@ -59,6 +60,10 @@
     kubernetes_corends_etcd_operator_image: ${_param:kubernetes_corends_etcd_operator_repo}/etcd-operator:v0.9.2
     kubernetes_containerd_source: ${_param:kubernetes_containerd_repo}/v1.12.0/crictl-v1.12.0-linux-amd64.tar.gz
     kubernetes_containerd_source_hash: md5=ff60b9ddfa5617f7ed14b3f3b6a60056
+    kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:apt_mk_version}
+    kubernetes_opencontrail_analyticsdb_image: ${_param:kubernetes_contrail_registry}/opencontrail-analyticsdb:${_param:apt_mk_version}
+    kubernetes_opencontrail_analytics_image: ${_param:kubernetes_contrail_registry}/opencontrail-analytics:${_param:apt_mk_version}
+    kubernetes_opencontrail_kube_manager_image: ${_param:kubernetes_contrail_registry}/opencontrail-kube-manager:${_param:apt_mk_version}
 
     kubelet_fail_on_swap: true
     kubernetes_dashboard_enabled: true
@@ -145,6 +150,15 @@
         contrail_network_controller:
           enabled: ${_param:kubernetes_contrail_network_controller_enabled}
           image: ${_param:kubernetes_contrail_network_controller_image}
+        opencontrail:
+          controller:
+            image: ${_param:kubernetes_opencontrail_controller_image}
+          analyticsdb:
+            image: ${_param:kubernetes_opencontrail_analyticsdb_image}
+          analytics:
+            image: ${_param:kubernetes_opencontrail_analytics_image}
+          kube_manager:
+            image: ${_param:kubernetes_opencontrail_kube_manager_image}
         flannel:
           image: ${_param:kubernetes_flannel_image}
         telegraf: