diff --git a/elasticsearch/client/single.yml b/elasticsearch/client/single.yml
index c4e2b43..41a3b57 100644
--- a/elasticsearch/client/single.yml
+++ b/elasticsearch/client/single.yml
@@ -1,9 +1,12 @@
 classes:
 - service.elasticsearch.client
 parameters:
+  _param:
+    elasticsearch_client_host: ${_param:stacklight_log_address}
+    elasticsearch_client_port: 9200
   elasticsearch:
     client:
       enabled: true
       server:
-        host: ${_param:stacklight_log_address}
-        port: ${_param:haproxy_elasticsearch_http_bind_port}
+        host: ${_param:elasticsearch_client_host}
+        port: ${_param:elasticsearch_client_port}
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 7d87ffe..5e3f4a1 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -30,6 +30,7 @@
         gerrit-trigger: {}
         git: {}
         heavy-job: {}
+        jobConfigHistory: {}
         ldap: {}
         matrix-auth: {}
         monitoring: {}
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 75c3776..e64858a 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -143,7 +143,7 @@
                 default: "http://127.0.0.1:8080"
               TEST_K8S_CONFORMANCE_IMAGE:
                 type: string
-                default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+                default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
 
               TEST_TEMPEST_IMAGE:
                 type: string
diff --git a/jenkins/client/job/deploy/rollout.yml b/jenkins/client/job/deploy/rollout.yml
index 4854845..93f5167 100644
--- a/jenkins/client/job/deploy/rollout.yml
+++ b/jenkins/client/job/deploy/rollout.yml
@@ -51,7 +51,7 @@
               default: "http://127.0.0.1:8080"
             TEST_K8S_CONFORMANCE_IMAGE:
               type: string
-              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
             TEST_TEMPEST_IMAGE:
               type: string
               description: "Tempest docker image"
diff --git a/jenkins/client/job/deploy/test.yml b/jenkins/client/job/deploy/test.yml
index b965a52..9b99ee5 100644
--- a/jenkins/client/job/deploy/test.yml
+++ b/jenkins/client/job/deploy/test.yml
@@ -31,7 +31,7 @@
               default: "http://127.0.0.1:8080"
             TEST_K8S_CONFORMANCE_IMAGE:
               type: string
-              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
 
             TEST_TEMPEST_IMAGE:
               type: string
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index 8816a66..6b0aebd 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -2,6 +2,7 @@
   - system.jenkins.client.job.deploy.update.package
   - system.jenkins.client.job.deploy.update.config
   - system.jenkins.client.job.deploy.update.saltenv
+  - system.jenkins.client.job.deploy.update.update_salt_environment
   - system.jenkins.client.job.deploy.update.upgrade
   - system.jenkins.client.job.deploy.update.upgrade_compute
   - system.jenkins.client.job.deploy.update.upgrade_ovs_gateway
diff --git a/jenkins/client/job/deploy/update/update_salt_environment.yml b/jenkins/client/job/deploy/update/update_salt_environment.yml
new file mode 100644
index 0000000..9efd6c5
--- /dev/null
+++ b/jenkins/client/job/deploy/update/update_salt_environment.yml
@@ -0,0 +1,28 @@
+#
+# Jobs to update Salt master environment (formulas and models)
+#
+parameters:
+  _param:
+    jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+  jenkins:
+    client:
+      job:
+        deploy-update-salt-environment:
+          type: workflow-scm
+          concurrent: true
+          display_name: "Deploy - update Salt environment"
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            credentials: "gerrit"
+            script: update-salt-environment.groovy
+          param:
+            SALT_MASTER_URL:
+              type: string
+              default: "${_param:jenkins_salt_api_url}"
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+            UPDATE_FORMULAS:
+              type: boolean
+              default: 'true'
\ No newline at end of file
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index b6bab31..b6ed029 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -38,6 +38,10 @@
               branch: "master"
               tags: "5.6 latest"
               dockerfile: "5.6/Dockerfile"
+            - name: jnlp-slave
+              branch: "master"
+              tags: "latest"
+              dockerfile: "Dockerfile"
           template:
             discard:
               build:
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 14dd93c..7fd041e 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -38,7 +38,7 @@
               ppa: mirantis-opencontrail/opencontrail-3.1.1
               upload_source_package: true
               dpdk: contrail_dpdk_2_1
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc311
               os: ubuntu
               dist: xenial
@@ -46,7 +46,7 @@
               ppa: mirantis-opencontrail/opencontrail-3.1.1
               upload_source_package: true
               dpdk: contrail_dpdk_2_1
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc32
               os: ubuntu
               dist: trusty
@@ -70,7 +70,7 @@
               ppa: mirantis-opencontrail/opencontrail-3.2.3
               upload_source_package: true
               dpdk: contrail_dpdk_2_1
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc323
               os: ubuntu
               dist: xenial
@@ -78,7 +78,7 @@
               ppa: mirantis-opencontrail/opencontrail-3.2.3
               upload_source_package: true
               dpdk: contrail_dpdk_2_1
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc40
               os: ubuntu
               dist: trusty
@@ -86,7 +86,7 @@
               ppa: mirantis-opencontrail/opencontrail-4.0
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc40
               os: ubuntu
               dist: xenial
@@ -94,7 +94,7 @@
               ppa: mirantis-opencontrail/opencontrail-4.0
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc41
               os: ubuntu
               dist: trusty
@@ -102,7 +102,7 @@
               ppa: mirantis-opencontrail/opencontrail-4.1
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc41
               os: ubuntu
               dist: xenial
@@ -110,7 +110,7 @@
               ppa: mirantis-opencontrail/opencontrail-4.1
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc666
               os: ubuntu
               dist: trusty
@@ -118,7 +118,7 @@
               ppa: mirantis-opencontrail/opencontrail-master
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc666
               os: ubuntu
               dist: xenial
@@ -126,7 +126,7 @@
               ppa: mirantis-opencontrail/opencontrail-master
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
           template:
             discard:
              build:
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 9ee63c1..bc7e847 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -57,7 +57,7 @@
               default: "http://127.0.0.1:8080"
             TEST_K8S_CONFORMANCE_IMAGE:
               type: string
-              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
             RUN_SPT_TESTS:
               type: boolean
               default: 'true'
diff --git a/reclass/storage/system/kubernetes_control_single.yml b/reclass/storage/system/kubernetes_control_single.yml
index 1ce0cd5..22e1883 100644
--- a/reclass/storage/system/kubernetes_control_single.yml
+++ b/reclass/storage/system/kubernetes_control_single.yml
@@ -1,6 +1,7 @@
 parameters:
   _param:
     kubernetes_control_node01_hostname: ctl01
+    kubernetes_control_node01_deploy_address: ${_param:kubernetes_control_node01_address}
     kubernetes_control_system_codename: xenial
   reclass:
     storage:
@@ -14,3 +15,4 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: ${_param:kubernetes_control_system_codename}
             single_address: ${_param:kubernetes_control_node01_address}
+            deploy_address: ${_param:kubernetes_control_node01_deploy_address}