diff --git a/charts/tezos/scripts/baker-endorser.sh b/charts/tezos/scripts/baker-endorser.sh
index f25e91f96..6a959ff38 100644
--- a/charts/tezos/scripts/baker-endorser.sh
+++ b/charts/tezos/scripts/baker-endorser.sh
@@ -17,6 +17,9 @@ my_baker_account="$(cat /etc/tezos/baker-account )"
 CLIENT="$TEZ_BIN/tezos-client -d $CLIENT_DIR"
 CMD="$TEZ_BIN/tezos-$DAEMON-$proto_command -d $CLIENT_DIR"
 
+# ensure we can run tezos-client commands without specifying client dir
+ln -s /var/tezos/client /home/tezos/.tezos-client
+
 while ! $CLIENT rpc get chains/main/blocks/head; do
     sleep 5
 done
diff --git a/charts/tezos/scripts/tezos-node.sh b/charts/tezos/scripts/tezos-node.sh
index f97a84738..d134956d9 100644
--- a/charts/tezos/scripts/tezos-node.sh
+++ b/charts/tezos/scripts/tezos-node.sh
@@ -2,6 +2,8 @@ set -x
 
 set
 
+# ensure we can run tezos-client commands without specifying client dir
+ln -s /var/tezos/client /home/tezos/.tezos-client
 #
 # Not every error is fatal on start.  In particular, with zerotier,
 # the listen-addr may not yet be bound causing tezos-node to fail.