diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 2423d7c7..3949339c 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -121,12 +121,7 @@ class ironic::keystone::auth (
 
   include ironic::deps
 
-  Keystone_user_role<| name == "${auth_name}@${tenant}" |> -> Anchor['ironic::service::end']
-  Keystone_user_role<| name == "${auth_name}@::::${system_scope}" |> -> Anchor['ironic::service::end']
-
-  if $configure_endpoint {
-    Keystone_endpoint["${region}/${service_name}::${service_type}"] -> Anchor['ironic::service::end']
-  }
+  Keystone::Resource::Service_identity['ironic'] -> Anchor['ironic::service::end']
 
   keystone::resource::service_identity { 'ironic':
     configure_user      => $configure_user,
diff --git a/manifests/keystone/auth_inspector.pp b/manifests/keystone/auth_inspector.pp
index e09754be..77821d5d 100644
--- a/manifests/keystone/auth_inspector.pp
+++ b/manifests/keystone/auth_inspector.pp
@@ -114,12 +114,7 @@ class ironic::keystone::auth_inspector (
 
   $real_service_name = pick($service_name, $auth_name)
 
-  Keystone_user_role<| name == "${auth_name}@${tenant}" |> ~> Service <| name == 'ironic-inspector' |>
-  Keystone_user_role<| name == "${auth_name}@::::${system_scope}" |> ~> Service <| name == 'ironic-inspector' |>
-
-  if $configure_endpoint {
-    Keystone_endpoint["${region}/${real_service_name}::${service_type}"] ~> Service <| name == 'ironic-inspector' |>
-  }
+  Keystone::Resource::Service_identity['ironic-inspector'] -> Service <| name == 'ironic-inspector' |>
 
   keystone::resource::service_identity { 'ironic-inspector':
     configure_user      => $configure_user,