diff --git a/manifests/db.pp b/manifests/db.pp
index e01d8e7..932a415 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -67,4 +67,8 @@ class cloudkitty::db (
     pool_timeout            => $database_pool_timeout,
     mysql_enable_ndb        => $mysql_enable_ndb,
   }
+
+  # all db settings should be applied and all packages should be installed
+  # before dbsync starts
+  Oslo::Db['cloudkitty_config'] -> Anchor['cloudkitty::dbsync::begin']
 }
diff --git a/manifests/deps.pp b/manifests/deps.pp
index b8460c1..d087efa 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -31,19 +31,6 @@ class cloudkitty::deps {
   -> Cloudkitty_api_paste_ini<||>
   -> Anchor['cloudkitty::config::end']
 
-  # all coordination settings should be applied and all packages should be
-  # installed before service startup
-  Oslo::Coordination<||> -> Anchor['cloudkitty::service::begin']
-
-  # all db settings should be applied and all packages should be installed
-  # before dbsync starts
-  Oslo::Db<||> -> Anchor['cloudkitty::dbsync::begin']
-
-  # policy config should occur in the config block also.
-  Anchor['cloudkitty::config::begin']
-  -> Openstacklib::Policy<| tag == 'cloudkitty' |>
-  -> Anchor['cloudkitty::config::end']
-
   # On any uwsgi config change, we must restart Cloudkitty API.
   Anchor['cloudkitty::config::begin']
   -> Cloudkitty_api_uwsgi_config<||>
diff --git a/manifests/orchestrator.pp b/manifests/orchestrator.pp
index 87395d7..c92b618 100644
--- a/manifests/orchestrator.pp
+++ b/manifests/orchestrator.pp
@@ -28,6 +28,10 @@ class cloudkitty::orchestrator (
     manage_config => false,
   }
 
+  # all coordination settings should be applied and all packages should be
+  # installed before service startup
+  Oslo::Coordination['cloudkitty_config'] -> Anchor['cloudkitty::service::begin']
+
   cloudkitty_config {
     'orchestrator/coordination_url': value => $coordination_url, secret => true;
     'orchestrator/max_workers':      value => $max_workers;
diff --git a/manifests/policy.pp b/manifests/policy.pp
index f2ff158..d5c8a7b 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -69,6 +69,11 @@ class cloudkitty::policy (
 
   create_resources('openstacklib::policy', { $policy_path => $policy_parameters })
 
+  # policy config should occur in the config block also.
+  Anchor['cloudkitty::config::begin']
+  -> Openstacklib::Policy[$policy_path]
+  -> Anchor['cloudkitty::config::end']
+
   oslo::policy { 'cloudkitty_config':
     enforce_scope        => $enforce_scope,
     enforce_new_defaults => $enforce_new_defaults,