diff --git a/wx b/wx
index d114a9f..954d70f 100755
--- a/wx
+++ b/wx
@@ -984,10 +984,10 @@ pxi-eas-data-decrypt(){
     if [[ -f $LOCATION/ansible-vault/eas/$SERIAL && $(base64 "$LOCATION/ansible-vault/eas/$SERIAL") != "" ]]
     then
       i=0
-      for file in "$PWD"/eas/data/$SERIAL/*/*/credentials;
+      for file in "$WX_HOME/infra"/eas/data/$SERIAL/*/*/credentials;
       do
         i=$((i + 1))
-        echo "$i)${file#"$PWD/eas/data/$SERIAL/"}"
+        echo "$i)${file#"$WX_HOME/infra/eas/data/$SERIAL/"}"
         ansible-vault decrypt --vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)"@"$LOCATION/ansible-vault/eas/$SERIAL" "$file"
       done
     fi
@@ -1003,12 +1003,12 @@ pxi-eas-data-deliver(){
 
   if [[ -n ${args['confirm']} ]]
   then
-    cd "$PWD/ansible"
+    cd "$WX_HOME/infra/ansible"
 
     playbook=cli
     tasks=eas-data-deliver
     limit="${args['limit']:-all}"
-    vaulted=(--vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)@~/.warengroup/credentials/ansible-vault/eas/$SERIAL")
+    vaulted=(--vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)@$WX_HOME/credentials/ansible-vault/eas/$SERIAL")
 
     /opt/ansible/bin/ansible-playbook $playbook.yml -t "$tasks" --limit "$limit,localhost" --extra-vars "${args['vars']}" "${vaulted[@]}"
     cd "$OLDPWD"
@@ -1023,10 +1023,10 @@ pxi-eas-data-encrypt(){
   if [[ -f $LOCATION/ansible-vault/eas/$SERIAL && $(base64 "$LOCATION/ansible-vault/eas/$SERIAL") != "" ]]
   then
     i=0
-    for file in "$PWD"/eas/data/$SERIAL/*/*/credentials;
+    for file in "$WX_HOME/infra"/eas/data/$SERIAL/*/*/credentials;
     do
       i=$((i + 1))
-      echo "$i)${file#"$PWD/eas/data/$SERIAL/"}"
+      echo "$i)${file#"$WX_HOME/infra/eas/data/$SERIAL/"}"
       ansible-vault encrypt --vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)"@"$LOCATION/ansible-vault/eas/$SERIAL" "$file"
     done
   fi
@@ -1039,12 +1039,12 @@ pxi-eas-data-retrieve(){
 
   if [[ -n ${args['confirm']} ]]
   then
-    cd "$PWD/ansible"
+    cd "$WX_HOME/infra/ansible"
 
     playbook=cli
     tasks=eas-data-retrieve
     limit="${args['limit']:-all}"
-    vaulted=(--vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)@~/.warengroup/credentials/ansible-vault/eas/$SERIAL")
+    vaulted=(--vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)@$WX_HOME/credentials/ansible-vault/eas/$SERIAL")
 
     /opt/ansible/bin/ansible-playbook $playbook.yml -t "$tasks" --limit "$limit,localhost" --extra-vars "${args['vars']}" "${vaulted[@]}"
     cd "$OLDPWD"
@@ -1093,9 +1093,9 @@ wxi-eas-token-create(){
 
   wxi-header "SSH" h4
 
-  if [[ ! -f "$LOCATION/ssh/eas/$SERIAL" || ! -f "$PWD/eas/credentials/ssh/$SERIAL.pub" ]]
+  if [[ ! -f "$LOCATION/ssh/eas/$SERIAL" || ! -f "$WX_HOME/eas/credentials/ssh/$SERIAL.pub" ]]
   then
-    if [[ ! -f "$LOCATION/ssh/eas/$SERIAL" && -f "$PWD/eas/credentials/ssh/$SERIAL.pub" ]]
+    if [[ ! -f "$LOCATION/ssh/eas/$SERIAL" && -f "$WX_HOME/eas/credentials/ssh/$SERIAL.pub" ]]
     then
       OLDOLDPWD=$OLDPWD
       cd "$LOCATION/ssh/eas"
@@ -1156,11 +1156,11 @@ wxi-eas-token-create(){
       wxi-repeat "\n" 1
     fi
 
-    if [[ -f "$LOCATION/ssh/eas/$SERIAL.pub" && ! -f "$PWD/eas/credentials/ssh/$SERIAL.pub" ]]
+    if [[ -f "$LOCATION/ssh/eas/$SERIAL.pub" && ! -f "$WX_HOME/infra/eas/credentials/ssh/$SERIAL.pub" ]]
     then
       wxi-content text* "Delivering: "
-      cp "$LOCATION/ssh/eas/$SERIAL.pub" "$PWD/eas/credentials/ssh/$SERIAL.pub"
-      if [[ -f "$PWD/eas/credentials/ssh/$SERIAL.pub" ]]
+      cp "$LOCATION/ssh/eas/$SERIAL.pub" "$WX_HOME/infra/eas/credentials/ssh/$SERIAL.pub"
+      if [[ -f "$WX_HOME/infra/eas/credentials/ssh/$SERIAL.pub" ]]
       then
         wxi-content text "Ready ✔"
       else
@@ -1178,15 +1178,15 @@ wxi-eas-token-erase(){
 
   wxi-content text* "Processing: "
 
-  if [[ -f "$LOCATION/$serial" || -f "$LOCATION/$serial.pub" || -f "$PWD/eas/credentials/ssh/$serial.pub" ]]
+  if [[ -f "$LOCATION/$serial" || -f "$LOCATION/$serial.pub" || -f "$WX_HOME/infra/eas/credentials/ssh/$serial.pub" ]]
   then
     if [[ -n ${args['confirm']} ]]
     then
       rm -f "$LOCATION/ssh/eas/$serial"
       rm -f "$LOCATION/ssh/eas/$serial.pub"
-      rm -f "$PWD/eas/credentials/ssh/$serial.pub"
+      rm -f "$WX_HOME/infra/eas/credentials/ssh/$serial.pub"
 
-      if [[ ! -f "$LOCATION/ssh/eas/$serial" && ! -f "$LOCATION/ssh/eas/$serial.pub" && ! -f "$PWD/eas/credentials/ssh/$serial.pub" ]]
+      if [[ ! -f "$LOCATION/ssh/eas/$serial" && ! -f "$LOCATION/ssh/eas/$serial.pub" && ! -f "$WX_HOME/infra/eas/credentials/ssh/$serial.pub" ]]
       then
         wxi-content text "Ready ✔"
       else