diff --git a/neutron/files/queens/l3_agent.ini b/neutron/files/queens/l3_agent.ini
index 339ab04..052c70b 100644
--- a/neutron/files/queens/l3_agent.ini
+++ b/neutron/files/queens/l3_agent.ini
@@ -199,6 +199,7 @@
 
 # Availability zone of this node (string value)
 #availability_zone = nova
+availability_zone = {{ neutron.availability_zone|default('nova') }}
 
 #
 # From neutron.base.agent
diff --git a/neutron/files/queens/neutron-generic.conf b/neutron/files/queens/neutron-generic.conf
index 6b47f46..16352de 100644
--- a/neutron/files/queens/neutron-generic.conf
+++ b/neutron/files/queens/neutron-generic.conf
@@ -67,6 +67,7 @@
 # resource is empty, availability zone is considered for high availability
 # while scheduling the resource. (list value)
 #default_availability_zones =
+default_availability_zones = {{ neutron.availability_zone|default('nova') }}
 
 # Maximum number of DNS nameservers per subnet (integer value)
 #max_dns_nameservers = 5
@@ -402,7 +403,7 @@
 
 # Availability zone of this node (string value)
 #availability_zone = nova
-
+availability_zone = {{ neutron.availability_zone|default('nova') }}
 
 [cors]
 {%- if neutron.cors is defined %}
diff --git a/neutron/files/queens/neutron-server.conf b/neutron/files/queens/neutron-server.conf
index 6825a09..04de18a 100644
--- a/neutron/files/queens/neutron-server.conf
+++ b/neutron/files/queens/neutron-server.conf
@@ -99,6 +99,7 @@
 # resource is empty, availability zone is considered for high availability
 # while scheduling the resource. (list value)
 #default_availability_zones =
+default_availability_zones = {{ server.availability_zone|default('nova') }}
 
 # Maximum number of DNS nameservers per subnet (integer value)
 #max_dns_nameservers = 5
@@ -447,7 +448,7 @@
 
 # Availability zone of this node (string value)
 #availability_zone = nova
-
+availability_zone = {{ server.availability_zone|default('nova') }}
 
 [cors]
 {%- if server.cors is defined %}