diff --git a/docker/setup.sh b/docker/setup.sh
index 14f3d4866a..4f4fee11f1 100755
--- a/docker/setup.sh
+++ b/docker/setup.sh
@@ -1,20 +1,20 @@
-#!/bin/sh
+#!/bin/bash
+set -o errexit -o nounset -o pipefail
 
 PASSWORD=${PASSWORD:-1234567890}
-# we can override the default token tickers as cli args
-STAKE=${1:-ustake}
-FEE=${2:-ucosm}
+STAKE=${STAKE_TOKEN:-ustake}
+FEE=${FEE_TOKEN:-ucosm}
 
 wasmd init --chain-id=testing testing
 # staking/governance token is hardcoded in config, change this
 sed -i "s/\"stake\"/\"$STAKE\"/" "$HOME"/.wasmd/config/genesis.json
-(echo $PASSWORD; echo $PASSWORD) | wasmcli keys add validator
+(echo "$PASSWORD"; echo "$PASSWORD") | wasmcli keys add validator
 # hardcode the validator account for this instance
-echo $PASSWORD | wasmd add-genesis-account validator "1000000000$STAKE,1000000000$FEE"
+echo "$PASSWORD" | wasmd add-genesis-account validator "1000000000$STAKE,1000000000$FEE"
 # (optionally) add a few more genesis accounts
 for addr in "$@"; do
-  wasmd add-genesis-account $addr "1000000000$STAKE,1000000000$FEE"
+  wasmd add-genesis-account "$addr" "1000000000$STAKE,1000000000$FEE"
 done
 # submit a genesis validator tx
-(echo $PASSWORD; echo $PASSWORD; echo $PASSWORD) | wasmd gentx --name validator --amount "250000000$STAKE"
-wasmd collect-gentxs
\ No newline at end of file
+(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | wasmd gentx --name validator --amount "250000000$STAKE"
+wasmd collect-gentxs