diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
index 060ddab..8365a2f 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
@@ -21,6 +21,9 @@
   foundation_flavor:
     type: string
 
+  bm_availability_zone:
+    type: string
+
 resources:
   subnets:
     type: MCP::Subnets
@@ -42,6 +45,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: 'system-phys-2401'
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
@@ -65,6 +69,7 @@
       mcp_version: { get_param: mcp_version }
       instance_domain: {get_param: instance_domain}
       instance_name: foundation
+      availability_zone: { get_param: bm_availability_zone }
       management_net: 'system-phys-2401'
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'