diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
index 7c415b7..210390f 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
@@ -73,6 +73,11 @@
   foundation_image:
     type: string
 
+  bm_availability_zone:
+    type: string
+  vm_availability_zone:
+    type: string
+
 resources:
   networks:
     type: MCP::Networks
@@ -100,6 +105,7 @@
       env_name: { get_param: env_name }
       mcp_version: { get_param: mcp_version }
       cfg01_flavor: { get_param: cfg_flavor }
+      availability_zone: { get_param: bm_availability_zone }
       management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
       control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
       tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -126,6 +132,7 @@
       instance02_name: ctl02
       instance03_name: ctl03
       instance_flavor: {get_param: ctl_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -177,6 +184,7 @@
       instance02_name: dbs02
       instance03_name: dbs03
       instance_flavor: {get_param: dbs_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -228,6 +236,7 @@
       instance02_name: kvm02
       instance03_name: kvm03
       instance_flavor: {get_param: kvm_fake_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -279,6 +288,7 @@
       instance02_name: msg02
       instance03_name: msg03
       instance_flavor: {get_param: msg_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -330,6 +340,7 @@
       instance02_name: cid02
       instance03_name: cid03
       instance_flavor: {get_param: cid_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -381,6 +392,7 @@
       instance02_name: mon02
       instance03_name: mon03
       instance_flavor: {get_param: mon_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -432,6 +444,7 @@
       instance02_name: log02
       instance03_name: log03
       instance_flavor: {get_param: log_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -483,6 +496,7 @@
       instance02_name: mtr02
       instance03_name: mtr03
       instance_flavor: {get_param: mtr_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -532,6 +546,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: prx01
       instance_flavor: {get_param: prx_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
@@ -557,6 +572,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: prx02
       instance_flavor: {get_param: prx_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
@@ -582,6 +598,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: cmp001
       instance_flavor: {get_param: cmp_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
@@ -607,6 +624,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: cmp002
       instance_flavor: {get_param: cmp_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
@@ -633,6 +651,7 @@
       instance_name: foundation
       instance_image: { get_param: foundation_image }
       instance_flavor: {get_param: foundation_flavor}
+      availability_zone: { get_param: bm_availability_zone }
       management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
       control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
       tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -668,6 +687,7 @@
       instance02_name: cmn02
       instance03_name: cmn03
       instance_flavor: {get_param: cmn_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -719,6 +739,7 @@
       instance02_name: rgw02
       instance03_name: rgw03
       instance_flavor: {get_param: rgw_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -770,6 +791,7 @@
       instance02_name: osd002
       instance03_name: osd003
       instance_flavor: {get_param: osd_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -821,6 +843,7 @@
       instance02_name: gtw02
       instance03_name: gtw03
       instance_flavor: {get_param: gtw_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -872,6 +895,7 @@
       instance02_name: kmn02
       instance03_name: kmn03
       instance_flavor: {get_param: kmn_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
@@ -921,6 +945,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: dns01
       instance_flavor: {get_param: dns_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
@@ -946,6 +971,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: dns02
       instance_flavor: {get_param: dns_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
@@ -973,6 +999,7 @@
       instance02_name: mdb02
       instance03_name: mdb03
       instance_flavor: {get_param: mdb_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join: