diff --git a/mojaloop/iac/roles/vault/defaults/main.yaml b/mojaloop/iac/roles/vault/defaults/main.yaml
index 4cf2c184..78b0f39a 100644
--- a/mojaloop/iac/roles/vault/defaults/main.yaml
+++ b/mojaloop/iac/roles/vault/defaults/main.yaml
@@ -2,7 +2,6 @@ vault_image_version: 1.13
 vault_root_dir: /root/vault-compose
 vault_listening_port: 8200
 vault_fqdn: vault.domain.null
-vault_region: eu-west-1
-vault_acme_email: null@null.com
 vault_gitlab_url: http://gitlab.url
-vault_gitlab_token: "#crazytoken$"
\ No newline at end of file
+vault_gitlab_token: "#crazytoken$"
+vault_root_token_key: VAULT_ROOT_TOKEN
\ No newline at end of file
diff --git a/mojaloop/iac/roles/vault/templates/run-and-init.sh.j2 b/mojaloop/iac/roles/vault/templates/run-and-init.sh.j2
index 80c7b194..8e842847 100644
--- a/mojaloop/iac/roles/vault/templates/run-and-init.sh.j2
+++ b/mojaloop/iac/roles/vault/templates/run-and-init.sh.j2
@@ -11,13 +11,13 @@ then
     export VAULT_ROOT_TOKEN=$(cat /tmp/output.json | jq .root_token | tr -d '"')
     if [ $VAULT_ROOT_TOKEN != "" ]
     then
-        export VAULT_ROOT_TOKEN_FOUND=$(curl -sw '%%{http_code}' --request GET "$${GITLAB_URL}/VAULT_ROOT_TOKEN" --header "Authorization: Bearer $GITLAB_TOKEN" -o /dev/null)
+        export VAULT_ROOT_TOKEN_FOUND=$(curl -sw '%%{http_code}' --request GET "$${GITLAB_URL}/{{ vault_root_token_key }}" --header "Authorization: Bearer $GITLAB_TOKEN" -o /dev/null)
         if [ $VAULT_ROOT_TOKEN_FOUND == "404" ]
         then
-            curl -s --request POST "$GITLAB_URL" --header "Authorization: Bearer $GITLAB_TOKEN" --form "key=VAULT_ROOT_TOKEN" --form "value=$VAULT_ROOT_TOKEN" --form "raw=true" --form "masked=true" -o /dev/null
+            curl -s --request POST "$GITLAB_URL" --header "Authorization: Bearer $GITLAB_TOKEN" --form "key={{ vault_root_token_key }}" --form "value=$VAULT_ROOT_TOKEN" --form "raw=true" --form "masked=true" -o /dev/null
         else
             echo "vault root token already present, updating code"
-            curl -s --request PUT "$${GITLAB_URL}/VAULT_ROOT_TOKEN" --header "Authorization: Bearer $GITLAB_TOKEN" --form "value=$VAULT_ROOT_TOKEN" -o /dev/null
+            curl -s --request PUT "$${GITLAB_URL}/{{ vault_root_token_key }}" --header "Authorization: Bearer $GITLAB_TOKEN" --form "value=$VAULT_ROOT_TOKEN" -o /dev/null
         fi
     else
         echo "VAULT_ROOT_TOKEN not parsed correctly, exiting"