diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 0e59942..05c9212 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -5,6 +5,7 @@
     server:
       enabled: true
       fwaas: false
+      dns_domain: novalocal
       tunnel_type: vxlan
       version: ${_param:neutron_version}
       bind:
@@ -36,4 +37,4 @@
         host: ${_param:cluster_vip_address}
         user: nova
         password: ${_param:keystone_nova_password}
-        tenant: service
\ No newline at end of file
+        tenant: service
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 7fc2d57..25e4531 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -6,6 +6,7 @@
       enabled: true
       plugin: ml2
       fwaas: false
+      dns_domain: novalocal
       tunnel_type: vxlan
       version: ${_param:neutron_version}
       bind:
@@ -36,4 +37,4 @@
         host: ${_param:single_address}
         user: nova
         password: ${_param:keystone_nova_password}
-        tenant: service
\ No newline at end of file
+        tenant: service
diff --git a/neutron/files/juno/neutron-server.conf.contrail.Debian b/neutron/files/juno/neutron-server.conf.contrail.Debian
index 87175b4..63aa88c 100644
--- a/neutron/files/juno/neutron-server.conf.contrail.Debian
+++ b/neutron/files/juno/neutron-server.conf.contrail.Debian
@@ -511,4 +511,4 @@
 quota_port = -1
 
 [NOVA]
-vif_types = vrouter
\ No newline at end of file
+vif_types = vrouter
diff --git a/neutron/files/kilo/neutron-server.conf.contrail.Debian b/neutron/files/kilo/neutron-server.conf.contrail.Debian
index d822922..fe2defb 100644
--- a/neutron/files/kilo/neutron-server.conf.contrail.Debian
+++ b/neutron/files/kilo/neutron-server.conf.contrail.Debian
@@ -1047,4 +1047,4 @@
 vif_types = vrouter
 
 [service_providers]
-service_provider = LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default
\ No newline at end of file
+service_provider = LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default
diff --git a/neutron/files/liberty/neutron-server.conf.contrail.Debian b/neutron/files/liberty/neutron-server.conf.contrail.Debian
index 41460a3..7d75561 100644
--- a/neutron/files/liberty/neutron-server.conf.contrail.Debian
+++ b/neutron/files/liberty/neutron-server.conf.contrail.Debian
@@ -119,6 +119,8 @@
 # Allow sending resource operation notification to DHCP agent
 # dhcp_agent_notification = True
 
+dns_domain = {{ neutron.dns_domain }}
+
 # Enable or disable bulk create/update/delete operations
 # allow_bulk = True
 # Enable or disable pagination