diff --git a/manifests/db.pp b/manifests/db.pp
index b3912cf2..ff06f96e 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -67,6 +67,7 @@ class ironic::db (
     db_max_retries          => $database_db_max_retries,
     pool_timeout            => $database_pool_timeout,
     mysql_enable_ndb        => $mysql_enable_ndb,
+    tag                     => 'ironic',
   }
 
 }
diff --git a/manifests/deps.pp b/manifests/deps.pp
index 30abc6b0..db1d708c 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -28,7 +28,8 @@ class ironic::deps {
 
   # all db settings should be applied and all packages should be installed
   # before dbsync starts
-  Oslo::Db<||> -> Anchor['ironic::dbsync::begin']
+  Oslo::Db<| tag == 'ironic' |> -> Anchor['ironic::dbsync::begin']
+  Oslo::Db<| tag == 'ironic-inspector' |> -> Anchor['ironic::dbsync::begin']
 
   # ironic-inspector is supported by this module.  This service uses a
   # specific conf file and uses it's own config provider. Split out install
@@ -39,7 +40,9 @@ class ironic::deps {
   -> anchor { 'ironic-inspector::config::begin': }
   -> Ironic_inspector_config<||>
   ~> anchor { 'ironic-inspector::config::end': }
-  -> anchor { 'ironic-inspector::dbsync::begin': }
+  -> anchor { 'ironic-inspector::db::begin': }
+  -> anchor { 'ironic-inspector::db::end': }
+  ~> anchor { 'ironic-inspector::dbsync::begin': }
   -> anchor { 'ironic-inspector::dbsync::end': }
   ~> anchor { 'ironic-inspector::service::begin': }
   ~> Service<| tag == 'ironic-inspector-service' |>
@@ -49,9 +52,6 @@ class ironic::deps {
   ~> Service<| tag == 'ironic-inspector-dnsmasq-service' |>
   ~> Anchor['ironic-inspector::service::end']
 
-  Anchor['ironic::db::end']
-  -> Anchor['ironic-inspector::dbsync::begin']
-
   # On any uwsgi config change, we must restart Ironic API.
   Anchor['ironic::config::begin']
   -> Ironic_api_uwsgi_config<||>
diff --git a/manifests/inspector/db.pp b/manifests/inspector/db.pp
index 53b33c13..2eabf212 100644
--- a/manifests/inspector/db.pp
+++ b/manifests/inspector/db.pp
@@ -67,6 +67,7 @@ class ironic::inspector::db (
     max_overflow            => $database_max_overflow,
     pool_timeout            => $database_pool_timeout,
     mysql_enable_ndb        => $mysql_enable_ndb,
+    tag                     => 'ironic-inspector',
   }
 
 }
diff --git a/manifests/inspector/db/mysql.pp b/manifests/inspector/db/mysql.pp
index a9f4c483..cab1f06f 100644
--- a/manifests/inspector/db/mysql.pp
+++ b/manifests/inspector/db/mysql.pp
@@ -54,6 +54,8 @@ class ironic::inspector::db::mysql (
   $collate       = 'utf8_general_ci',
 ) {
 
+  include ironic::deps
+
   ::openstacklib::db::mysql { 'ironic-inspector':
     user          => $user,
     password      => $password,
@@ -64,6 +66,7 @@ class ironic::inspector::db::mysql (
     allowed_hosts => $allowed_hosts,
   }
 
-  ::Openstacklib::Db::Mysql['ironic-inspector'] ~> Exec<| title == 'ironic-inspector-dbsync' |>
-
+  Anchor['ironic-inspector::db::begin']
+  ~> Class['ironic::inspector::db::mysql']
+  ~> Anchor['ironic-inspector::db::end']
 }
diff --git a/manifests/inspector/db/postgresql.pp b/manifests/inspector/db/postgresql.pp
index bb110f8e..54feedc6 100644
--- a/manifests/inspector/db/postgresql.pp
+++ b/manifests/inspector/db/postgresql.pp
@@ -32,7 +32,7 @@ class ironic::inspector::db::postgresql(
   $privileges = 'ALL',
 ) {
 
-  Class['ironic::inspector::db::postgresql'] -> Service<| title == 'ironic-inspector' |>
+  include ironic::deps
 
   ::openstacklib::db::postgresql { 'ironic-inspector':
     password   => $password,
@@ -42,6 +42,7 @@ class ironic::inspector::db::postgresql(
     privileges => $privileges,
   }
 
-  ::Openstacklib::Db::Postgresql['ironic-inspector'] ~> Exec<| title == 'ironic-inspector-dbsync' |>
-
+  Anchor['ironic-inspector::db::begin']
+  ~> Class['ironic::inspector::db::postgresql']
+  ~> Anchor['ironic-inspector::db::end']
 }