diff --git a/files/glance-api.conf b/files/glance-api.conf
index d386c95..0358a7a 100644
--- a/files/glance-api.conf
+++ b/files/glance-api.conf
@@ -175,4 +175,4 @@
 auth_port = 35357
 auth_protocol = http
 auth_uri = http://127.0.0.1:5000/
-admin_token = 999888777666
+admin_token = %SERVICE_TOKEN%
diff --git a/files/glance-registry.conf b/files/glance-registry.conf
index 5bbc6c0..c3ca9a7 100644
--- a/files/glance-registry.conf
+++ b/files/glance-registry.conf
@@ -64,7 +64,7 @@
 auth_port = 35357
 auth_protocol = http
 auth_uri = http://127.0.0.1:5000/
-admin_token = 999888777666
+admin_token = %SERVICE_TOKEN%
 
 [filter:keystone_shim]
 paste.filter_factory = keystone.middleware.glance_auth_token:filter_factory
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index e6f384f..cfb4572 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -34,7 +34,7 @@
 # $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 admin admin 2015-02-05T00:00
+$BIN_DIR/keystone-manage $* token add %SERVICE_TOKEN% 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"