diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py
index f07a9788a..f0821b20b 100644
--- a/packstack/plugins/nova_300.py
+++ b/packstack/plugins/nova_300.py
@@ -271,7 +271,7 @@ def gather_host_keys(config, messages):
 
     for host in compute_hosts:
         local = utils.ScriptRunner()
-        local.append('ssh-keyscan %s' % host)
+        local.append('ssh-keyscan -q %s' % host)
         retcode, hostkey = local.execute()
         config['HOST_KEYS_%s' % host] = hostkey
 
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
index af8c1576b..8fdb38fa0 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
@@ -20,12 +20,33 @@ class packstack::neutron::api ()
       })
     }
 
+    $rpc_workrers = lookup('CONFIG_NEUTRON_L2_AGENT') ? {
+      'ovn'   => 0,
+      default => lookup('CONFIG_SERVICE_WORKERS'),
+    }
+    $rpc_service_name = $rpc_workers ? {
+      0       => false,
+      default => undef,
+    }
+    $rpc_state_report_workers = lookup('CONFIG_NEUTRON_L2_AGENT') ? {
+      'ovn'   => 0,
+      default => undef,
+    }
+
+    class { 'neutron::wsgi::apache':
+      bind_host => $bind_host,
+      ssl       => false,
+      workers   => lookup('CONFIG_SERVICE_WORKERS'),
+    }
     class { 'neutron::server':
-      sync_db               => true,
-      enabled               => true,
-      api_workers           => lookup('CONFIG_SERVICE_WORKERS'),
-      rpc_workers           => lookup('CONFIG_SERVICE_WORKERS'),
-      service_providers     => lookup('SERVICE_PROVIDERS', { merge => 'unique' }),
+      sync_db                  => true,
+      enabled                  => true,
+      api_workers              => lookup('CONFIG_SERVICE_WORKERS'),
+      rpc_workers              => $rpc_workers,
+      rpc_state_report_workers => $rpc_state_report_workers,
+      api_service_name         => 'httpd',
+      rpc_service_name         => $rpc_service_name,
+      service_providers        => lookup('SERVICE_PROVIDERS', { merge => 'unique' }),
     }
 
     if $neutron_vpnaas_enabled {
diff --git a/packstack/puppet/modules/packstack/manifests/placement.pp b/packstack/puppet/modules/packstack/manifests/placement.pp
index 5e49715dc..fd462c319 100644
--- a/packstack/puppet/modules/packstack/manifests/placement.pp
+++ b/packstack/puppet/modules/packstack/manifests/placement.pp
@@ -22,10 +22,11 @@ class packstack::placement ()
         'database' => 'placement',
       })
     }
-
     include placement::db::sync
-    include placement::api
 
+    class { 'placement::api':
+      api_service_name => 'httpd',
+    }
     class { 'placement::wsgi::apache':
       bind_host => $bind_host,
       ssl       => false,