diff --git a/devstack/lib/barbican b/devstack/lib/barbican
index 51876e506..8b1478e10 100644
--- a/devstack/lib/barbican
+++ b/devstack/lib/barbican
@@ -579,7 +579,7 @@ function install_vault {
     screen -d -m bash -c "vault server -dev -dev-listen-address=${HOST_IP}:8200 2>&1 >vault.log"
 
     # get the root_token_id, use tempfile for counter
-    TOKEN_ID_FILE="vault_root_token_id"
+    TOKEN_ID_FILE="${BARBICAN_DIR}/vault_root_token_id"
     touch $TOKEN_ID_FILE
 
     COUNTER=0
@@ -610,7 +610,7 @@ function install_vault {
 }
 
 function configure_vault_plugin {
-    root_token_id=`cat vault_root_token_id`
+    root_token_id=`cat ${BARBICAN_DIR}/vault_root_token_id`
     iniset $BARBICAN_CONF secretstore enabled_secretstore_plugins vault_plugin
     iniset $BARBICAN_CONF vault_plugin root_token_id $root_token_id
     iniset $BARBICAN_CONF vault_plugin vault_url "http://${HOST_IP}:8200"