diff --git a/metadata/service/api/cluster.yml b/metadata/service/api/cluster.yml
index f6bd55e..f907f09 100644
--- a/metadata/service/api/cluster.yml
+++ b/metadata/service/api/cluster.yml
@@ -9,6 +9,7 @@
     octavia_api_bind_port: 9876
     octavia_api_v1_enabled: True
     octavia_api_v2_enabled: True
+    octavia_amphora_availability_zone: 'nova'
   octavia:
     api:
       enabled: true
@@ -42,3 +43,5 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
+      nova:
+        availability_zone: ${_param:octavia_amphora_availability_zone}
diff --git a/metadata/service/api/single.yml b/metadata/service/api/single.yml
index dfd1128..57bcdfa 100644
--- a/metadata/service/api/single.yml
+++ b/metadata/service/api/single.yml
@@ -7,6 +7,7 @@
     keystone_octavia_endpoint_type: internal
     octavia_api_v1_enabled: True
     octavia_api_v2_enabled: True
+    octavia_amphora_availability_zone: 'nova'
   octavia:
     api:
       enabled: true
@@ -40,3 +41,5 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
+      nova:
+        availability_zone: ${_param:octavia_amphora_availability_zone}
\ No newline at end of file
diff --git a/metadata/service/manager/cluster.yml b/metadata/service/manager/cluster.yml
index ac9db54..cd0db05 100644
--- a/metadata/service/manager/cluster.yml
+++ b/metadata/service/manager/cluster.yml
@@ -7,6 +7,7 @@
     keystone_octavia_endpoint_type: internal
     octavia_loadbalancer_topology: 'SINGLE'
     octavia_hm_bind_port: 5555
+    octavia_amphora_availability_zone: 'nova'
   octavia:
     manager:
       enabled: true
@@ -55,3 +56,5 @@
         controller_ip_port_list: ${_param:octavia_health_manager_node01_address}:${_param:octavia_hm_bind_port},${_param:octavia_health_manager_node02_address}:${_param:octavia_hm_bind_port},${_param:octavia_health_manager_node03_address}:${_param:octavia_hm_bind_port}
       house_keeping:
         spare_amphora_pool_size: 0
+      nova:
+        availability_zone: ${_param:octavia_amphora_availability_zone}
diff --git a/metadata/service/manager/single.yml b/metadata/service/manager/single.yml
index 13713b0..4bde8bb 100644
--- a/metadata/service/manager/single.yml
+++ b/metadata/service/manager/single.yml
@@ -7,6 +7,7 @@
     keystone_octavia_endpoint_type: internal
     octavia_loadbalancer_topology: 'SINGLE'
     octavia_hm_bind_port: 5555
+    octavia_amphora_availability_zone: 'nova'
   octavia:
     manager:
       enabled: true
@@ -55,3 +56,5 @@
         controller_ip_port_list: ${_param:octavia_hm_bind_ip}:${_param:octavia_hm_bind_port}
       house_keeping:
         spare_amphora_pool_size: 0
+      nova:
+        availability_zone: ${_param:octavia_amphora_availability_zone}