diff --git a/jenkins/client/job/deploy/lab/release/mcp05.yml b/jenkins/client/job/deploy/lab/release/mcp05.yml
index 05e74d9..5342163 100644
--- a/jenkins/client/job/deploy/lab/release/mcp05.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp05.yml
@@ -3,8 +3,8 @@
 parameters:
   _param:
     jenkins_deploy_jobs:
-      - stack_name: virtual_mcp05_dvr
-        stack_env: devcloud
+      - stack_name: virtual_mcp_ovs
+        stack_env: devcloud_virtual_mcp05_dvr
         stack_install: core,openstack,dvr
         stack_type: heat
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp10.yml b/jenkins/client/job/deploy/lab/release/mcp10.yml
index a692378..951bb1d 100644
--- a/jenkins/client/job/deploy/lab/release/mcp10.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp10.yml
@@ -30,20 +30,20 @@
         job_timer: ""
 
       # virtual
-      - stack_name: virtual_mcp10_contrail
-        stack_env: devcloud
+      - stack_name: virtual_mcp_contrail
+        stack_env: devcloud_virtual_mcp10_contrail
         stack_install: core,openstack,contrail
         stack_type: heat
         stack_test: ""
         job_timer: "H H(0-6) * * *"
-      - stack_name: virtual_mcp10_dvr
-        stack_env: devcloud
+      - stack_name: virtual_mcp_ovs
+        stack_env: devcloud_virtual_mcp10_dvr
         stack_install: core,openstack,dvr
         stack_type: heat
         stack_test: ""
         job_timer: "H H(0-6) * * *"
-      - stack_name: virtual_mcp10_ovs
-        stack_env: devcloud
+      - stack_name: virtual_mcp_ovs
+        stack_env: devcloud_virtual_mcp10_ovs
         stack_install: core,openstack,ovs
         stack_type: heat
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index b147427..e06df03 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -3,20 +3,20 @@
 parameters:
   _param:
     jenkins_deploy_jobs:
-      - stack_name: virtual_mcp11_contrail
-        stack_env: devcloud
+      - stack_name: virtual_mcp_contrail
+        stack_env: devcloud_virtual_mcp11_contrail
         stack_install: core,openstack,contrail
         stack_type: heat
         stack_test: ""
         job_timer: ""
-      - stack_name: virtual_mcp11_dvr
-        stack_env: devcloud
+      - stack_name: virtual_mcp_ovs
+        stack_env: devcloud_virtual_mcp11_dvr
         stack_install: core,openstack,dvr
         stack_type: heat
         stack_test: ""
         job_timer: ""
-      - stack_name: virtual_mcp11_ovs
-        stack_env: devcloud
+      - stack_name: virtual_mcp_ovs
+        stack_env: devcloud_virtual_mcp11_ovs
         stack_install: core,openstack,ovs
         stack_type: heat
         stack_test: ""
@@ -45,14 +45,14 @@
         stack_type: heat
         stack_test: k8s
         job_timer: "H H(0-6) * * *"
-      - stack_name: virtual_mcp11_contrail_nfv
-        stack_env: devcloud
+      - stack_name: virtual_mcp_contrail
+        stack_env: devcloud_virtual_mcp11_contrail_nfv
         stack_install: core,openstack,contrail
         stack_type: heat
         stack_test: ""
         job_timer: "H H(0-6) * * *"
-      - stack_name: virtual_mcp11_ovs_dpdk
-        stack_env: devcloud
+      - stack_name: virtual_mcp_ovs
+        stack_env: devcloud_virtual_mcp11_ovs_dpdk
         stack_install: core,openstack,ovs
         stack_type: heat
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mk.yml b/jenkins/client/job/deploy/lab/release/mk.yml
index 4968285..c505b12 100644
--- a/jenkins/client/job/deploy/lab/release/mk.yml
+++ b/jenkins/client/job/deploy/lab/release/mk.yml
@@ -4,27 +4,27 @@
   _param:
     jenkins_deploy_jobs:
       # mk20
-      - stack_name: virtual_mk20_advanced
-        stack_env: devcloud
+      - stack_name: virtual_mk_advanced
+        stack_env: devcloud_virtual_mk20_advanced
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
         job_timer: ""
-      - stack_name: virtual_mk20_basic
-        stack_env: devcloud
+      - stack_name: virtual_mk_basic
+        stack_env: devcloud_virtual_mk20_basic
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
         job_timer: ""
       # mk22
-      - stack_name: virtual_mk22_advanced
-        stack_env: devcloud
+      - stack_name: virtual_mk_advanced
+        stack_env: devcloud_virtual_mk22_advanced
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
         job_timer: ""
-      - stack_name: virtual_mk22_basic
-        stack_env: devcloud
+      - stack_name: virtual_mk_basic
+        stack_env: devcloud_virtual_mk22_basic
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""