diff --git a/attributes/default.rb b/attributes/default.rb
index e59163b..d748fab 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -129,7 +129,7 @@ end
 
 default['openstack']['block-storage']['service_tenant_name'] = 'service'
 default['openstack']['block-storage']['service_user'] = 'cinder'
-default['openstack']['block-storage']['service_role'] = 'admin'
+default['openstack']['block-storage']['service_role'] = 'service'
 
 # SAN Support
 default['openstack']['block-storage']['san']['san_ip'] = '127.0.0.1'
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index 89ef2a0..7f8ef2c 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -173,7 +173,7 @@ describe 'openstack-block-storage::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 service Role to Cinder Service User for Cinder Service Tenant'
       ).with(
@@ -181,7 +181,7 @@ describe 'openstack-block-storage::identity_registration' do
         bootstrap_token: 'bootstrap-token',
         tenant_name: 'service',
         user_name: 'cinder',
-        role_name: 'admin'
+        role_name: 'service'
       )
     end
   end