diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index 9f77dc9..c32b3ca 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -80,7 +80,7 @@
 # * 'nova' is the default value
 #
 #  (string value)
-#default_availability_zone=nova
+default_availability_zone = {{ compute.availability_zone|default('nova') }}
 
 # Length of generated instance admin passwords. (integer value)
 # Minimum value: 0
diff --git a/nova/files/ocata/nova-controller.conf.Debian b/nova/files/ocata/nova-controller.conf.Debian
index 058174c..7bef3bf 100644
--- a/nova/files/ocata/nova-controller.conf.Debian
+++ b/nova/files/ocata/nova-controller.conf.Debian
@@ -76,7 +76,7 @@
 # * 'nova' is the default value
 #
 #  (string value)
-#default_availability_zone=nova
+default_availability_zone = {{ controller.availability_zone|default('nova') }}
 
 # Length of generated instance admin passwords. (integer value)
 # Minimum value: 0
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 270510b..418f931 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -81,7 +81,7 @@
 # * 'nova' is the default value
 #
 #  (string value)
-#default_availability_zone=nova
+default_availability_zone = {{ compute.availability_zone|default('nova') }}
 
 # Length of generated instance admin passwords. (integer value)
 # Minimum value: 0
diff --git a/nova/files/pike/nova-controller.conf.Debian b/nova/files/pike/nova-controller.conf.Debian
index a73630b..ef3d1b5 100644
--- a/nova/files/pike/nova-controller.conf.Debian
+++ b/nova/files/pike/nova-controller.conf.Debian
@@ -83,7 +83,7 @@
 # * 'nova' is the default value
 #
 #  (string value)
-#default_availability_zone=nova
+default_availability_zone = {{ controller.availability_zone|default('nova') }}
 
 # Length of generated instance admin passwords. (integer value)
 # Minimum value: 0
diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index 6f59898..5d81c47 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -36,7 +36,7 @@
 #
 # * Any string representing an existing availability zone name.
 #  (string value)
-#default_availability_zone = nova
+default_availability_zone = {{ compute.availability_zone|default('nova') }}
 
 #
 # Default availability zone for instances.
diff --git a/nova/files/queens/nova-controller.conf.Debian b/nova/files/queens/nova-controller.conf.Debian
index 6d731fc..c5239d7 100644
--- a/nova/files/queens/nova-controller.conf.Debian
+++ b/nova/files/queens/nova-controller.conf.Debian
@@ -36,7 +36,7 @@
 #
 # * Any string representing an existing availability zone name.
 #  (string value)
-#default_availability_zone = nova
+default_availability_zone = {{ controller.availability_zone|default('nova') }}
 
 #
 # Default availability zone for instances.
diff --git a/nova/files/rocky/nova-compute.conf.Debian b/nova/files/rocky/nova-compute.conf.Debian
index 6c52ab2..8687c77 100644
--- a/nova/files/rocky/nova-compute.conf.Debian
+++ b/nova/files/rocky/nova-compute.conf.Debian
@@ -29,7 +29,7 @@
 #
 # * Any string representing an existing availability zone name.
 #  (string value)
-#default_availability_zone = nova
+default_availability_zone = {{ compute.availability_zone|default('nova') }}
 
 #
 # Default availability zone for instances.
diff --git a/nova/files/rocky/nova-controller.conf.Debian b/nova/files/rocky/nova-controller.conf.Debian
index 7b7a74c..51dc408 100644
--- a/nova/files/rocky/nova-controller.conf.Debian
+++ b/nova/files/rocky/nova-controller.conf.Debian
@@ -29,7 +29,7 @@
 #
 # * Any string representing an existing availability zone name.
 #  (string value)
-#default_availability_zone = nova
+default_availability_zone = {{ controller.availability_zone|default('nova') }}
 
 #
 # Default availability zone for instances.