diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index d67421f..b631cd9 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -192,7 +192,7 @@ class tuskar::keystone::auth (
     Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'tuskar-api' |>
   }
 
-  Keystone_endpoint["${region}/${auth_name}"]  ~> Service <| name == 'tuskar-api' |>
+  Keystone_endpoint["${region}/${auth_name}::${service_type}"]  ~> Service <| name == 'tuskar-api' |>
 
   keystone::resource::service_identity { $auth_name:
     configure_user      => $configure_user,
diff --git a/spec/classes/tuskar_keystone_auth_spec.rb b/spec/classes/tuskar_keystone_auth_spec.rb
index c933443..319d546 100644
--- a/spec/classes/tuskar_keystone_auth_spec.rb
+++ b/spec/classes/tuskar_keystone_auth_spec.rb
@@ -25,13 +25,12 @@ describe 'tuskar::keystone::auth' do
       :roles   => ['admin']
     )}
 
-    it { is_expected.to contain_keystone_service('tuskar').with(
+    it { is_expected.to contain_keystone_service('tuskar::management').with(
       :ensure      => 'present',
-      :type        => 'management',
       :description => 'Tuskar Management Service'
     ) }
 
-    it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar').with(
+    it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar::management').with(
       :ensure       => 'present',
       :public_url   => "http://127.0.0.1:8585",
       :admin_url    => "http://127.0.0.1:8585",
@@ -47,7 +46,7 @@ describe 'tuskar::keystone::auth' do
         :internal_url => 'https://10.0.0.11:8585' }
     end
 
-    it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar').with(
+    it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar::management').with(
       :ensure       => 'present',
       :public_url   => 'https://10.0.0.10:8585',
       :admin_url    => 'https://10.0.0.11:8585',
@@ -77,7 +76,7 @@ describe 'tuskar::keystone::auth' do
         :admin_address    => '10.10.10.12' }
     end
 
-    it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar').with(
+    it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar::management').with(
       :ensure       => 'present',
       :public_url   => "https://10.10.10.10:80",
       :internal_url => "http://10.10.10.11:81",
@@ -93,8 +92,8 @@ describe 'tuskar::keystone::auth' do
 
     it { is_expected.to contain_keystone_user('tuskary') }
     it { is_expected.to contain_keystone_user_role('tuskary@services') }
-    it { is_expected.to contain_keystone_service('tuskary') }
-    it { is_expected.to contain_keystone_endpoint('RegionOne/tuskary') }
+    it { is_expected.to contain_keystone_service('tuskary::management') }
+    it { is_expected.to contain_keystone_endpoint('RegionOne/tuskary::management') }
   end
 
   describe 'when overriding various parameters' do