diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index 8cc472fdaf..e97ad73d42 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -71,14 +71,7 @@ keystone user-role-add --user $DEMO_USER --role $MEMBER_ROLE --tenant_id $DEMO_T
 keystone user-role-add --user $DEMO_USER --role $MEMBER_ROLE --tenant_id $INVIS_TENANT
 
 
-# Services
-keystone service-create --name=keystone \
-                        --type=identity \
-                        --description="Keystone Identity Service"
-
-keystone service-create --name=nova \
-                        --type=compute \
-                        --description="Nova Compute Service"
+# Configure service users/roles
 NOVA_USER=$(get_id keystone user-create --name=nova \
                                         --pass="$SERVICE_PASSWORD" \
                                         --tenant_id $SERVICE_TENANT \
@@ -87,13 +80,6 @@ keystone user-role-add --tenant_id $SERVICE_TENANT \
                        --user $NOVA_USER \
                        --role $ADMIN_ROLE
 
-keystone service-create --name=ec2 \
-                        --type=ec2 \
-                        --description="EC2 Compatibility Layer"
-
-keystone service-create --name=glance \
-                        --type=image \
-                        --description="Glance Image Service"
 GLANCE_USER=$(get_id keystone user-create --name=glance \
                                           --pass="$SERVICE_PASSWORD" \
                                           --tenant_id $SERVICE_TENANT \
@@ -102,16 +88,7 @@ keystone user-role-add --tenant_id $SERVICE_TENANT \
                        --user $GLANCE_USER \
                        --role $ADMIN_ROLE
 
-if [[ "$ENABLED_SERVICES" =~ "n-vol" ]]; then
-    keystone service-create --name="nova-volume" \
-                            --type=volume \
-                            --description="Nova Volume Service"
-fi
-
 if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
-    keystone service-create --name=swift \
-                            --type="object-store" \
-                            --description="Swift Service"
     SWIFT_USER=$(get_id keystone user-create --name=swift \
                                              --pass="$SERVICE_PASSWORD" \
                                              --tenant_id $SERVICE_TENANT \
@@ -122,9 +99,6 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
 fi
 
 if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
-    keystone service-create --name=quantum \
-                            --type=network \
-                            --description="Quantum Service"
     QUANTUM_USER=$(get_id keystone user-create --name=quantum \
                                                --pass="$SERVICE_PASSWORD" \
                                                --tenant_id $SERVICE_TENANT \