diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 9e866c775..b50140d4a 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -93,12 +93,7 @@ class nova::keystone::auth(
 
   include nova::deps
 
-  Keystone_user_role<| name == "${auth_name}@${tenant}" |> -> Anchor['nova::service::end']
-  Keystone_user_role<| name == "${auth_name}@::::${system_scope}" |> -> Anchor['nova::service::end']
-
-  if $configure_endpoint {
-    Keystone_endpoint["${region}/${service_name}::${service_type}"] -> Anchor['nova::service::end']
-  }
+  Keystone::Resource::Service_identity['nova'] -> Anchor['nova::service::end']
 
   keystone::resource::service_identity { 'nova':
     configure_user      => $configure_user,
diff --git a/manifests/metadata/novajoin/auth.pp b/manifests/metadata/novajoin/auth.pp
index 9fa18f6df..388b422d1 100644
--- a/manifests/metadata/novajoin/auth.pp
+++ b/manifests/metadata/novajoin/auth.pp
@@ -91,10 +91,7 @@ class nova::metadata::novajoin::auth(
   $configure_user_role     = true,
 ) {
 
-  if $configure_endpoint {
-    Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| name == 'novajoin-server' |>
-    Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| name == 'novajoin-notify' |>
-  }
+  Keystone::Resource::Service_identity['novajoin'] -> Service <| name == 'novajoin-server' |>
 
   keystone::resource::service_identity { 'novajoin':
     configure_user      => $configure_user,