diff --git a/ansible/roles/neutron/templates/metadata_agent.ini.j2 b/ansible/roles/neutron/templates/metadata_agent.ini.j2
index cdee21fcbb3223f3d4b9c125478a8edde34455a9..c66cb4dd2229203925b998e5ef859feb10f28fe4 100644
--- a/ansible/roles/neutron/templates/metadata_agent.ini.j2
+++ b/ansible/roles/neutron/templates/metadata_agent.ini.j2
@@ -5,3 +5,4 @@ nova_metadata_host = {{ nova_internal_fqdn }}
 nova_metadata_port = {{ nova_metadata_port }}
 metadata_proxy_shared_secret = {{ metadata_secret }}
 nova_metadata_protocol = {{ internal_protocol }}
+metadata_workers = {{ neutron_metadata_workers }}
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index ee5bcf65ab6c03cd02484c00267ca2e42b78b370..a7df46805f2fe8a9570611724a3903be3f3acc3e 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -18,7 +18,6 @@ bind_port = {{ neutron_server_listen_port }}
 api_paste_config = /etc/neutron/api-paste.ini
 
 api_workers = {{ neutron_api_workers }}
-metadata_workers = {{ neutron_metadata_workers }}
 rpc_workers = {{ openstack_service_rpc_workers }}
 rpc_state_report_workers = {{ openstack_service_rpc_workers }}
 
@@ -190,7 +189,6 @@ password = {{ placement_keystone_password }}
 user_domain_name = {{ default_user_domain_name }}
 project_name = service
 project_domain_name = {{ default_project_domain_name }}
-os_region_name = {{ openstack_region_name }}
 endpoint_type = internal
 cafile = {{ openstack_cacert }}
 region_name = {{ openstack_region_name }}