diff --git a/register_rln.sh b/register_rln.sh
index ab660f1..dd55321 100755
--- a/register_rln.sh
+++ b/register_rln.sh
@@ -7,10 +7,9 @@ if test -f ./keystore/keystore.json; then
   exit 1
 fi
 
-
 if test -f .env; then
   echo "Using .env file"
-  . $(pwd)/.env
+  . "$(pwd)"/.env
 fi
 
 # TODO: Set nwaku release when ready instead of quay
@@ -21,7 +20,7 @@ if test -n "${ETH_CLIENT_ADDRESS}"; then
   exit 1
 fi
 
-docker run -v $(pwd)/keystore:/keystore/:Z harbor.status.im/wakuorg/nwaku:v0.30.1 generateRlnKeystore \
+docker run -v "$(pwd)/keystore":/keystore/:Z harbor.status.im/wakuorg/nwaku:v0.30.1 generateRlnKeystore \
 --rln-relay-eth-client-address=${RLN_RELAY_ETH_CLIENT_ADDRESS} \
 --rln-relay-eth-private-key=${ETH_TESTNET_KEY} \
 --rln-relay-eth-contract-address=0xCB33Aa5B38d79E3D9Fa8B10afF38AA201399a7e3 \
diff --git a/run_node.sh b/run_node.sh
index 90333a9..d66b560 100644
--- a/run_node.sh
+++ b/run_node.sh
@@ -91,8 +91,8 @@ exec /usr/bin/wakunode\
   --store-message-db-url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/postgres"\
   --rln-relay-eth-client-address="${RLN_RELAY_ETH_CLIENT_ADDRESS}"\
   --rln-relay-tree-path="/etc/rln_tree"\
-  ${RLN_RELAY_CRED_PATH}\
-  ${RLN_RELAY_CRED_PASSWORD}\
+  "${RLN_RELAY_CRED_PATH}"\
+  "${RLN_RELAY_CRED_PASSWORD}"\
   ${DNS_WSS_CMD}\
   ${NODEKEY}\
   ${STORE_RETENTION_POLICY}\