diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index 1635b9d..23646d2 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -3,6 +3,7 @@ BIN_DIR=${BIN_DIR:-.}
 # Tenants
 $BIN_DIR/keystone-manage $* tenant add admin
 $BIN_DIR/keystone-manage $* tenant add demo
+$BIN_DIR/keystone-manage $* tenant add invisible_to_admin
 
 # Users
 $BIN_DIR/keystone-manage $* user add admin secrete
@@ -13,43 +14,28 @@ $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 grant Admin admin 1
-$BIN_DIR/keystone-manage $* role grant Member demo 2
-$BIN_DIR/keystone-manage $* role grant Admin admin 2
+$BIN_DIR/keystone-manage $* role grant Admin admin admin
+$BIN_DIR/keystone-manage $* role grant Member 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 KeystoneAdmin admin
 $BIN_DIR/keystone-manage $* role grant KeystoneServiceAdmin admin
 
 # Services
-$BIN_DIR/keystone-manage $* service add nova_compat nova_compat nova_compat
 $BIN_DIR/keystone-manage $* service add compute compute compute
 $BIN_DIR/keystone-manage $* service add glance glance glance
 $BIN_DIR/keystone-manage $* service add identity identity identity
 
 #endpointTemplates
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne 1 http://%HOST_IP%:8774/v1.0/ http://%HOST_IP%:8774/v1.0  http://%HOST_IP%:8774/v1.0 1 1
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne 2 http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id%  http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne 3 http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% 1 1
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne 4 http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:5001/v2.0 http://%HOST_IP%:5000/v2.0 1 1
+$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne compute http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id%  http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1
+$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% 1 1
+$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne identity http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:5001/v2.0 http://%HOST_IP%:5000/v2.0 1 1
 # $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1
 
 # Tokens
-$BIN_DIR/keystone-manage $* token add 999888777666 1 1 2015-02-05T00:00
-
-#Tenant endpoints
-$BIN_DIR/keystone-manage $* endpoint add 1 1
-$BIN_DIR/keystone-manage $* endpoint add 1 2
-$BIN_DIR/keystone-manage $* endpoint add 1 3
-$BIN_DIR/keystone-manage $* endpoint add 1 4
-$BIN_DIR/keystone-manage $* endpoint add 1 5
-$BIN_DIR/keystone-manage $* endpoint add 1 6
-
-$BIN_DIR/keystone-manage $* endpoint add 2 1
-$BIN_DIR/keystone-manage $* endpoint add 2 2
-$BIN_DIR/keystone-manage $* endpoint add 2 3
-$BIN_DIR/keystone-manage $* endpoint add 2 4
-$BIN_DIR/keystone-manage $* endpoint add 2 5
-$BIN_DIR/keystone-manage $* endpoint add 2 6
+$BIN_DIR/keystone-manage $* token add 999888777666 admin admin 2015-02-05T00:00
 
+# EC2 related creds
 $BIN_DIR/keystone-manage $* credentials add admin EC2 'admin:admin' admin admin || echo "no support for adding credentials"
 $BIN_DIR/keystone-manage $* credentials add demo EC2 'demo:demo' demo demo || echo "no support for adding credentials"