diff --git a/attributes/default.rb b/attributes/default.rb
index b093943..a170ecc 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -58,7 +58,7 @@ default['openstack']['telemetry']['group'] = 'ceilometer'
 default['openstack']['telemetry']['region'] = node['openstack']['region']
 default['openstack']['telemetry']['service_user'] = 'ceilometer'
 default['openstack']['telemetry']['service_tenant_name'] = 'service'
-default['openstack']['telemetry']['service_role'] = 'admin'
+default['openstack']['telemetry']['service_role'] = 'service'
 
 # A PEM encoded Certificate Authority to use when verifying HTTPs connections (for service polling authentication)
 default['openstack']['telemetry']['service-credentials']['cafile'] = nil
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index 20a6146..a820fb5 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -56,8 +56,8 @@ openstack_identity_register 'Register Service User' do
   action :create_user
 end
 
-# Grant Admin role to Service User for Service Tenant
-openstack_identity_register "Grant 'admin' Role to Service User for Service Tenant" do
+# Grant Service role to Service User for Service Tenant
+openstack_identity_register "Grant 'service' Role to Service User for Service Tenant" do
   auth_uri auth_uri
   bootstrap_token bootstrap_token
   tenant_name service_tenant_name
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index c4347bf..e117b1f 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -33,15 +33,15 @@ describe 'openstack-telemetry::identity_registration' do
       )
     end
 
-    it 'grants admin role to service user for service tenant' do
+    it 'grants service role to service user for service tenant' do
       expect(chef_run).to grant_role_openstack_identity_register(
-        "Grant 'admin' Role to Service User for Service Tenant"
+        "Grant 'service' Role to Service User for Service Tenant"
       ).with(
         auth_uri: 'http://127.0.0.1:35357/v2.0',
         bootstrap_token: 'bootstrap-token',
         tenant_name: 'service',
         user_name: 'ceilometer',
-        role_name: 'admin'
+        role_name: 'service'
       )
     end