diff --git a/devstack/Vagrantfile b/devstack/Vagrantfile
index 9da8247e9..b9bc12c86 100644
--- a/devstack/Vagrantfile
+++ b/devstack/Vagrantfile
@@ -85,7 +85,6 @@ DATABASE_PASSWORD=secretdatabase
 RABBIT_PASSWORD=secretrabbit
 ADMIN_PASSWORD=secretadmin
 SERVICE_PASSWORD=secretservice
-SERVICE_TOKEN=111222333444
 
 LOGFILE=$DEST/logs/stack.sh.log
 LOGDIR=$DEST/logs
diff --git a/devstack/files/keystone/create_monasca_service.py b/devstack/files/keystone/create_monasca_service.py
index 30729a504..9098119e0 100644
--- a/devstack/files/keystone/create_monasca_service.py
+++ b/devstack/files/keystone/create_monasca_service.py
@@ -133,16 +133,17 @@ def main(argv):
              {'username': 'monasca-agent', 'project': 'mini-mon', 'password': 'password', 'role': 'monasca-agent'},
              {'username': 'demo', 'project': 'demo', 'password': 'secretadmin', 'role': 'monasca-user'}]
 
-    url = 'http://127.0.0.1:35357/v2.0'
+    service_host = argv[0]
+    url = 'http://' + service_host + ':35357/v2.0'
 
     token = None
 
     cacert = None
 
     if not token:
-        username = 'admin'
-        password = 'secretadmin'
-        tenant_name = 'admin'
+        username = argv[1]
+        password = argv[2]
+        tenant_name = argv[3]
         token = get_token(url, cacert, username, password, tenant_name)
 
     key = client.Client(token=token, endpoint=url, cacert=cacert)
@@ -161,7 +162,6 @@ def main(argv):
     if not add_user_roles(key, users):
         return 1
 
-    service_host = argv[0]
     monasca_url = 'http://' + service_host + ':8070/v2.0'
 
     if not add_service_endpoint(key, 'monasca', 'Monasca monitoring service', 'monitoring', monasca_url, 'RegionOne'):
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6415fd464..4b3bc6e54 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -1294,11 +1294,11 @@ function install_monasca_keystone_client {
 
     if [[ ${SERVICE_HOST} ]]; then
 
-        sudo /opt/monasca/bin/python /usr/local/bin/create_monasca_service.py ${SERVICE_HOST}
+        sudo /opt/monasca/bin/python /usr/local/bin/create_monasca_service.py ${SERVICE_HOST} ${OS_USERNAME} ${OS_PASSWORD} ${OS_PROJECT_NAME}
 
     else
 
-        sudo /opt/monasca/bin/python /usr/local/bin/create_monasca_service.py "127.0.0.1"
+        sudo /opt/monasca/bin/python /usr/local/bin/create_monasca_service.py "127.0.0.1" ${OS_USERNAME} ${OS_PASSWORD} ${OS_PROJECT_NAME}
 
     fi