diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
index d1f77b4..6f4bb14 100644
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
@@ -53,6 +53,11 @@
   foundation_image:
     type: string
 
+  bm_availability_zone:
+    type: string
+  vm_availability_zone:
+    type: string
+
 resources:
   networks:
     type: MCP::Networks
@@ -80,6 +85,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 } ]] }
@@ -107,6 +113,7 @@
       instance03_name: ctl03
       instance01_role: k8s_controller
       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:
@@ -158,6 +165,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:
@@ -209,6 +217,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:
@@ -260,6 +269,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:
@@ -311,6 +321,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:
@@ -362,6 +373,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:
@@ -411,6 +423,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: prx01
       instance_flavor: {get_param: cid_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
@@ -436,6 +449,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: prx02
       instance_flavor: {get_param: cid_flavor}
+      availability_zone: { get_param: vm_availability_zone }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
@@ -461,6 +475,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:
@@ -486,6 +501,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:
@@ -511,6 +527,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: cmp003
       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:
@@ -536,6 +553,7 @@
       instance_domain: {get_param: instance_domain}
       instance_name: cmp004
       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:
@@ -562,6 +580,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 } ]] }