diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf
index c91f3e7a..53591fe4 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -128,6 +128,8 @@ pci_passthrough_whitelist = {{ pci_passthrough_whitelist }}
 default_availability_zone = {{ default_availability_zone }}
 {% endif -%}
 
+metadata_workers = {{ workers }}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}
@@ -145,7 +147,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
 service_metadata_proxy=True
 {% endif -%}
 {% endif -%}
-metadata_workers = {{ workers }}
 {% endif -%}
 
 {% if glance_api_servers -%}
diff --git a/templates/liberty/nova.conf b/templates/liberty/nova.conf
index bf00cede..b527be23 100644
--- a/templates/liberty/nova.conf
+++ b/templates/liberty/nova.conf
@@ -132,6 +132,8 @@ default_availability_zone = {{ default_availability_zone }}
 resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 {% endif -%}
 
+metadata_workers = {{ workers }}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}
@@ -147,7 +149,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
 service_metadata_proxy=True
 {% endif -%}
 {% endif -%}
-metadata_workers = {{ workers }}
 {% endif -%}
 
 {% include "section-keystone-authtoken" %}
diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf
index 75f0e6f2..caeaed34 100644
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -134,6 +134,8 @@ default_availability_zone = {{ default_availability_zone }}
 resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 {% endif -%}
 
+metadata_workers = {{ workers }}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}
@@ -156,7 +158,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
 service_metadata_proxy=True
 {% endif -%}
 {% endif -%}
-metadata_workers = {{ workers }}
 {% endif -%}
 
 {% include "section-keystone-authtoken-mitaka" %}
diff --git a/templates/newton/nova.conf b/templates/newton/nova.conf
index 1c951b52..fdd3fbd3 100644
--- a/templates/newton/nova.conf
+++ b/templates/newton/nova.conf
@@ -134,6 +134,8 @@ default_availability_zone = {{ default_availability_zone }}
 resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 {% endif -%}
 
+metadata_workers = {{ workers }}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}
@@ -156,7 +158,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
 service_metadata_proxy=True
 {% endif -%}
 {% endif -%}
-metadata_workers = {{ workers }}
 {% endif -%}
 
 {% include "section-keystone-authtoken-mitaka" %}
diff --git a/templates/ocata/nova.conf b/templates/ocata/nova.conf
index bd3cd08d..592e2027 100644
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -135,6 +135,8 @@ default_availability_zone = {{ default_availability_zone }}
 resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 {% endif -%}
 
+metadata_workers = {{ workers }}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}
@@ -157,7 +159,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
 service_metadata_proxy=True
 {% endif -%}
 {% endif -%}
-metadata_workers = {{ workers }}
 {% endif -%}
 
 {% include "section-keystone-authtoken-mitaka" %}
diff --git a/templates/pike/nova.conf b/templates/pike/nova.conf
index 777122aa..a78d3bed 100644
--- a/templates/pike/nova.conf
+++ b/templates/pike/nova.conf
@@ -130,6 +130,8 @@ default_availability_zone = {{ default_availability_zone }}
 resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 {% endif -%}
 
+metadata_workers = {{ workers }}
+
 [pci]
 {% if pci_passthrough_whitelist -%}
 passthrough_whitelist = {{ pci_passthrough_whitelist }}
@@ -165,7 +167,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
 service_metadata_proxy=True
 {% endif -%}
 {% endif -%}
-metadata_workers = {{ workers }}
 {% endif -%}
 
 {% include "section-keystone-authtoken-mitaka" %}