diff --git a/packstack/puppet/modules/packstack/manifests/nova/api.pp b/packstack/puppet/modules/packstack/manifests/nova/api.pp
index 9775ff4fd..01432f65c 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/api.pp
@@ -25,14 +25,29 @@ class packstack::nova::api ()
 
     class { '::nova::api':
       api_bind_address                     => $bind_host,
-      metadata_listen                      => $bind_host,
       enabled                              => true,
-      neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED', undef),
       sync_db                              => false,
       sync_db_api                          => false,
       osapi_compute_workers                => hiera('CONFIG_SERVICE_WORKERS'),
-      metadata_workers                     => hiera('CONFIG_SERVICE_WORKERS'),
       allow_resize_to_same_host            => hiera('CONFIG_NOVA_ALLOW_RESIZE_TO_SAME'),
+      nova_metadata_wsgi_enabled           => true,
+      service_name                         => 'httpd',
+    }
+
+    class { '::nova::metadata':
+      neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED', undef),
+    }
+
+    class { '::nova::wsgi::apache_api':
+      bind_host => $bind_host,
+      ssl       => false,
+      workers   => hiera('CONFIG_SERVICE_WORKERS'),
+    }
+
+    class { '::nova::wsgi::apache_metadata':
+      bind_host => $bind_host,
+      ssl       => false,
+      workers   => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
     class { '::nova::db::sync':