diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index ba14a47f8f..6987797a37 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -275,7 +275,7 @@ if [[ "$ENABLED_SERVICES" =~ "tempest" ]]; then
         --role_id $MEMBER_ROLE
 fi
 
-if [[ "$ENABLED_SERVICES" =~ "cinder" ]]; then
+if [[ "$ENABLED_SERVICES" =~ "c-api" ]]; then
     CINDER_USER=$(get_id keystone user-create --name=cinder \
                                               --pass="$SERVICE_PASSWORD" \
                                               --tenant_id $SERVICE_TENANT \