diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp
index 4bfdc2d10..a10c7b582 100644
--- a/manifests/agents/ml2/ovs.pp
+++ b/manifests/agents/ml2/ovs.pp
@@ -354,7 +354,7 @@ class neutron::agents::ml2::ovs (
       enable  => $enabled,
       # TODO: Remove this require once ovs-cleanup service
       # script is packaged in neutron-openvswitch package
-      require => Package['neutron'],
+      require => Anchor['neutron::install::end'],
     }
   }
 }
diff --git a/manifests/deps.pp b/manifests/deps.pp
index 35c680207..cd7f97af1 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -67,6 +67,7 @@ class neutron::deps {
   Anchor['neutron::config::begin'] -> Neutron_vpnaas_agent_config<||> ~> Anchor['neutron::config::end']
   Anchor['neutron::config::begin'] -> Neutron_vpnaas_service_config<||> ~> Anchor['neutron::config::end']
   Anchor['neutron::config::begin'] -> Neutron_plugin_nsx<||> ~> Anchor['neutron::config::end']
+  Anchor['neutron::config::begin'] -> Neutron_rootwrap_config<||> ~> Anchor['neutron::config::end']
 
   # Support packages need to be installed in the install phase, but we don't
   # put them in the chain above because we don't want any false dependencies
diff --git a/manifests/policy.pp b/manifests/policy.pp
index 1daeb4edd..959ea75d0 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -28,6 +28,8 @@ class neutron::policy (
   $policy_path = '/etc/neutron/policy.json',
 ) {
 
+  include ::neutron::deps
+
   validate_hash($policies)
 
   Openstacklib::Policy::Base {
diff --git a/manifests/rootwrap.pp b/manifests/rootwrap.pp
index 2f1320812..b9d82ecf9 100644
--- a/manifests/rootwrap.pp
+++ b/manifests/rootwrap.pp
@@ -25,7 +25,7 @@ class neutron::rootwrap (
   $xenapi_connection_password = $::os_service_default,
 ) {
 
-  Neutron_rootwrap_config <||> ~> Service['neutron-ovs-agent-service']
+  include ::neutron::deps
 
   neutron_rootwrap_config {
     'xenapi/xenapi_connection_url':      value => $xenapi_connection_url;
diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb
index 7d47fe120..6b6b7c01f 100644
--- a/spec/classes/neutron_agents_ml2_ovs_spec.rb
+++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb
@@ -303,7 +303,7 @@ describe 'neutron::agents::ml2::ovs' do
       is_expected.to contain_service('ovs-cleanup-service').with(
         :name    => platform_params[:ovs_cleanup_service],
         :enable  => true
-      ).that_requires('Package[neutron]')
+      ).that_requires('Anchor[neutron::install::end]')
       is_expected.to contain_package('neutron-ovs-agent').that_requires('Anchor[neutron::install::begin]')
       is_expected.to contain_package('neutron-ovs-agent').that_notifies('Anchor[neutron::install::end]')
     end