diff --git a/README.rst b/README.rst
index 9b98a4d..0e61e76 100644
--- a/README.rst
+++ b/README.rst
@@ -278,6 +278,7 @@
         local_ip: 192.168.20.20 # br-mesh ip address
         dvr: False
         agent_mode: legacy
+        availability_zone: az1
         metadata:
           host: 127.0.0.1
           password: pass
@@ -387,6 +388,7 @@
         local_ip: 192.168.20.20 # br-mesh ip address
         dvr: True
         agent_mode: dvr_snat
+        availability_zone: az1
         metadata:
           host: 127.0.0.1
           password: pass
@@ -417,6 +419,7 @@
         dvr: True
         external_access: True     
         agent_mode: dvr
+        availability_zone: az1
         metadata:
           host: 127.0.0.1
           password: pass
diff --git a/neutron/files/mitaka/neutron-generic.conf.Debian b/neutron/files/mitaka/neutron-generic.conf.Debian
index d746ac2..0741f47 100644
--- a/neutron/files/mitaka/neutron-generic.conf.Debian
+++ b/neutron/files/mitaka/neutron-generic.conf.Debian
@@ -610,7 +610,7 @@
 #check_child_processes_interval = 60
 
 # Availability zone of this node (string value)
-#availability_zone = nova
+availability_zone = {{ neutron.availability_zone|default('nova') }}
 
 
 [cors]
diff --git a/neutron/files/newton/neutron-generic.conf.Debian b/neutron/files/newton/neutron-generic.conf.Debian
index 60ac0ce..545d04a 100644
--- a/neutron/files/newton/neutron-generic.conf.Debian
+++ b/neutron/files/newton/neutron-generic.conf.Debian
@@ -619,7 +619,7 @@
 #check_child_processes_interval = 60
 
 # Availability zone of this node (string value)
-#availability_zone = nova
+availability_zone = {{ neutron.availability_zone|default('nova') }}
 
 
 [cors]