diff --git a/neutron/files/mitaka/neutron-generic.conf b/neutron/files/mitaka/neutron-generic.conf
index 013b609..bef69aa 100644
--- a/neutron/files/mitaka/neutron-generic.conf
+++ b/neutron/files/mitaka/neutron-generic.conf
@@ -112,7 +112,7 @@
 dhcp_lease_duration = 600
 
 # Domain to use for building the hostnames (string value)
-#dns_domain = openstacklocal
+dns_domain = {{ neutron.get('dns_domain', 'openstacklocal') }}
 
 # Driver for external DNS integration. (string value)
 #external_dns_driver = <None>
diff --git a/neutron/files/newton/neutron-generic.conf b/neutron/files/newton/neutron-generic.conf
index bdb0c0a..257013f 100644
--- a/neutron/files/newton/neutron-generic.conf
+++ b/neutron/files/newton/neutron-generic.conf
@@ -112,7 +112,7 @@
 dhcp_lease_duration = 600
 
 # Domain to use for building the hostnames (string value)
-#dns_domain = openstacklocal
+dns_domain = {{ neutron.get('dns_domain', 'openstacklocal') }}
 
 # Driver for external DNS integration. (string value)
 #external_dns_driver = <None>
diff --git a/neutron/files/ocata/neutron-generic.conf b/neutron/files/ocata/neutron-generic.conf
index 48baf54..05b197d 100644
--- a/neutron/files/ocata/neutron-generic.conf
+++ b/neutron/files/ocata/neutron-generic.conf
@@ -90,7 +90,7 @@
 dhcp_lease_duration = 600
 
 # Domain to use for building the hostnames (string value)
-#dns_domain = openstacklocal
+dns_domain = {{ neutron.get('dns_domain', 'openstacklocal') }}
 
 # Driver for external DNS integration. (string value)
 #external_dns_driver = <None>
diff --git a/neutron/files/pike/neutron-generic.conf b/neutron/files/pike/neutron-generic.conf
index 1a51bbb..c7d22d2 100644
--- a/neutron/files/pike/neutron-generic.conf
+++ b/neutron/files/pike/neutron-generic.conf
@@ -93,7 +93,7 @@
 dhcp_lease_duration = {{ neutron.dhcp_lease_duration|default('600') }}
 
 # Domain to use for building the hostnames (string value)
-#dns_domain = openstacklocal
+dns_domain = {{ neutron.get('dns_domain', 'openstacklocal') }}
 
 # Driver for external DNS integration. (string value)
 #external_dns_driver = <None>
diff --git a/neutron/files/queens/neutron-generic.conf b/neutron/files/queens/neutron-generic.conf
index 274d549..172099d 100644
--- a/neutron/files/queens/neutron-generic.conf
+++ b/neutron/files/queens/neutron-generic.conf
@@ -89,7 +89,7 @@
 dhcp_lease_duration = {{ neutron.dhcp_lease_duration|default('600') }}
 
 # Domain to use for building the hostnames (string value)
-#dns_domain = openstacklocal
+dns_domain = {{ neutron.get('dns_domain', 'openstacklocal') }}
 
 # Driver for external DNS integration. (string value)
 #external_dns_driver = <None>
diff --git a/neutron/files/rocky/neutron-generic.conf b/neutron/files/rocky/neutron-generic.conf
index 922afd3..d4b1b28 100644
--- a/neutron/files/rocky/neutron-generic.conf
+++ b/neutron/files/rocky/neutron-generic.conf
@@ -81,7 +81,7 @@
 dhcp_lease_duration = {{ neutron.dhcp_lease_duration|default('600') }}
 
 # Domain to use for building the hostnames (string value)
-#dns_domain = openstacklocal
+dns_domain = {{ neutron.get('dns_domain', 'openstacklocal') }}
 
 # Driver for external DNS integration. (string value)
 #external_dns_driver = <None>