diff --git a/files/keystone.conf b/files/keystone.conf
index a646513b0d..6d0fd7e11d 100644
--- a/files/keystone.conf
+++ b/files/keystone.conf
@@ -64,7 +64,7 @@ ca_certs = /etc/keystone/ssl/certs/ca.pem
 cert_required = True
 
 #Role that allows to perform admin operations.
-keystone-admin-role = Admin
+keystone-admin-role = admin
 
 #Role that allows to perform service admin operations.
 keystone-service-admin-role = KeystoneServiceAdmin
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index 818919cf51..77f6b93330 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -10,19 +10,19 @@ $BIN_DIR/keystone-manage user add admin %ADMIN_PASSWORD%
 $BIN_DIR/keystone-manage user add demo %ADMIN_PASSWORD%
 
 # Roles
-$BIN_DIR/keystone-manage role add Admin
+$BIN_DIR/keystone-manage role add admin
 $BIN_DIR/keystone-manage role add Member
 $BIN_DIR/keystone-manage role add KeystoneAdmin
 $BIN_DIR/keystone-manage role add KeystoneServiceAdmin
 $BIN_DIR/keystone-manage role add sysadmin
 $BIN_DIR/keystone-manage role add netadmin
-$BIN_DIR/keystone-manage role grant Admin admin admin
+$BIN_DIR/keystone-manage role grant admin admin admin
 $BIN_DIR/keystone-manage role grant Member demo demo
 $BIN_DIR/keystone-manage role grant sysadmin demo demo
 $BIN_DIR/keystone-manage role grant netadmin demo demo
 $BIN_DIR/keystone-manage role grant Member demo invisible_to_admin
-$BIN_DIR/keystone-manage role grant Admin admin demo
-$BIN_DIR/keystone-manage role grant Admin admin
+$BIN_DIR/keystone-manage role grant admin admin demo
+$BIN_DIR/keystone-manage role grant admin admin
 $BIN_DIR/keystone-manage role grant KeystoneAdmin admin
 $BIN_DIR/keystone-manage role grant KeystoneServiceAdmin admin