diff --git a/docker/swarm/service/monitoring/prometheus_alertmanager.yml b/docker/swarm/service/monitoring/prometheus_alertmanager.yml
index 74b20f5..99eb226 100644
--- a/docker/swarm/service/monitoring/prometheus_alertmanager.yml
+++ b/docker/swarm/service/monitoring/prometheus_alertmanager.yml
@@ -19,5 +19,5 @@
           volume:
             site:
               type: bind
-              source: /srv/volumes/prometheus-config
+              source: /srv/volumes/prometheus
               destination: /opt/alertmanager/config
diff --git a/docker/swarm/service/monitoring/prometheus_server.yml b/docker/swarm/service/monitoring/prometheus_server.yml
index 24a9193..94207ca 100644
--- a/docker/swarm/service/monitoring/prometheus_server.yml
+++ b/docker/swarm/service/monitoring/prometheus_server.yml
@@ -25,5 +25,5 @@
           volume:
             site:
               type: bind
-              source: /srv/volumes/prometheus-config
+              source: /srv/volumes/prometheus
               destination: /opt/prometheus/config
diff --git a/glusterfs/client/volume/prometheus.yml b/glusterfs/client/volume/prometheus.yml
index f8b2f3d..2b2b7db 100644
--- a/glusterfs/client/volume/prometheus.yml
+++ b/glusterfs/client/volume/prometheus.yml
@@ -4,7 +4,7 @@
   glusterfs:
     client:
       volumes:
-        prometheus-config:
-          path: /srv/volumes/prometheus-config
+        prometheus:
+          path: /srv/volumes/prometheus
           server: ${_param:prometheus_glusterfs_service_host}
           opts: 'defaults'
diff --git a/glusterfs/server/volume/prometheus.yml b/glusterfs/server/volume/prometheus.yml
index 2c4ca31..144847a 100644
--- a/glusterfs/server/volume/prometheus.yml
+++ b/glusterfs/server/volume/prometheus.yml
@@ -2,13 +2,13 @@
   glusterfs:
     server:
       volumes:
-        prometheus-config:
-          storage: /srv/glusterfs/prometheus-config
+        prometheus:
+          storage: /srv/glusterfs/prometheus
           replica: 3
           bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/prometheus-config
-            - ${_param:cluster_node02_address}:/srv/glusterfs/prometheus-config
-            - ${_param:cluster_node03_address}:/srv/glusterfs/prometheus-config
+            - ${_param:cluster_node01_address}:/srv/glusterfs/prometheus
+            - ${_param:cluster_node02_address}:/srv/glusterfs/prometheus
+            - ${_param:cluster_node03_address}:/srv/glusterfs/prometheus
           options:
             cluster.readdir-optimize: On
             nfs.disable: On
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index bf58f39..6f95e30 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -29,7 +29,7 @@
                 default: "{{install}}"
               TEST:
                 type: string
-                default: ""
+                default: "{{test}}"
 
               # heat
               HEAT_TEMPLATE_URL:
diff --git a/jenkins/client/job/deploy/lab/mk/physical.yml b/jenkins/client/job/deploy/lab/mk/physical.yml
index a66909d..0767359 100644
--- a/jenkins/client/job/deploy/lab/mk/physical.yml
+++ b/jenkins/client/job/deploy/lab/mk/physical.yml
@@ -6,12 +6,16 @@
       - lab: mcp10_contrail
         install: core,kvm,openstack,contrail
         stack_type: physical
+        test: openstack
       - lab: mcp10_opencontrail_nfv
         install: core,kvm,openstack,nfv
         stack_type: physical
+        test: openstack
       - lab: mcp10_dvr
         install: core,kvm,openstack,dvr
         stack_type: physical
+        test: openstack
       - lab: mcp10_non_dvr
         install: core,kvm,openstack
         stack_type: physical
+        test: openstack
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index af65a4d..a97a22a 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -6,27 +6,40 @@
       - lab: virtual_mcp05_dvr
         install: core,openstack,dvr
         stack_type: heat
+        test: openstack
       - lab: virtual_mcp05_ovs
         install: core,openstack,ovs
         stack_type: heat
+        test: openstack
       - lab: virtual_mcp10_contrail
         install: core,openstack,contrail
         stack_type: heat
+        test: openstack
       - lab: virtual_mcp10_dvr
         install: core,openstack,dvr
         stack_type: heat
+        test: openstack
       - lab: virtual_mcp10_ovs
         install: core,openstack,ovs
         stack_type: heat
+        test: openstack
+      - lab: virtual_mcp10_k8s
+        install: core,k8s
+        stack_type: heat
+        test: k8s
       - lab: virtual_mk20_advanced
         install: core,openstack
         stack_type: heat
+        test: openstack
       - lab: virtual_mk20_basic
         install: core,openstack
         stack_type: heat
+        test: openstack
       - lab: virtual_mk22_advanced
         install: core,openstack
         stack_type: heat
+        test: openstack
       - lab: virtual_mk22_basic
         install: core,openstack
         stack_type: heat
+        test: openstack
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index d26e56e..5a4666a 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -9,26 +9,14 @@
               os: ubuntu
               dist: trusty
               branch: R3.1
-            - buildname: oc31
-              os: ubuntu
-              dist: xenial
-              branch: R3.1
             - buildname: oc311
               os: ubuntu
               dist: trusty
               branch: R3.1.1.x
-            - buildname: oc311
-              os: ubuntu
-              dist: xenial
-              branch: R3.1.1.x
             - buildname: oc32
               os: ubuntu
               dist: trusty
               branch: R3.2
-            - buildname: oc32
-              os: ubuntu
-              dist: xenial
-              branch: R3.2
           template:
             discard:
              build:
diff --git a/salt/minion/cert/k8s_client_prometheus.yml b/salt/minion/cert/k8s_client_prometheus.yml
index 04cd374..678ddbe 100644
--- a/salt/minion/cert/k8s_client_prometheus.yml
+++ b/salt/minion/cert/k8s_client_prometheus.yml
@@ -5,8 +5,8 @@
         k8s_client_prometheus:
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
-          key_file: /srv/volumes/prometheus-config/kubelet-client.key
-          cert_file: /srv/volumes/prometheus-config/kubelet-client.crt
+          key_file: /srv/volumes/prometheus/kubelet-client.key
+          cert_file: /srv/volumes/prometheus/kubelet-client.crt
           common_name: kubelet-client
           signing_policy: cert_client
           alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}