diff --git a/puppet-{{cookiecutter.project_name}}/manifests/keystone/auth.pp b/puppet-{{cookiecutter.project_name}}/manifests/keystone/auth.pp
index feda24e..a046656 100644
--- a/puppet-{{cookiecutter.project_name}}/manifests/keystone/auth.pp
+++ b/puppet-{{cookiecutter.project_name}}/manifests/keystone/auth.pp
@@ -100,12 +100,7 @@ class {{cookiecutter.project_name}}::keystone::auth (
 
   include {{cookiecutter.project_name}}::deps
 
-  if $configure_user_role {
-    Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == '{{cookiecutter.project_name}}-server' |>
-  }
-  if $configure_endpoint {
-    Keystone_endpoint["${region}/${service_name}::${service_type}"]  ~> Service <| name == '{{cookiecutter.project_name}}-server' |>
-  }
+  Keystone::Resource::Service_identity['{{cookiecutter.project_name}}'] -> Anchor['{{cookiecutter.project_name}}::service::end']
 
   keystone::resource::service_identity { '{{cookiecutter.project_name}}':
     ensure              => $ensure,