diff --git a/docker/client/entrypoint.sh b/docker/client/entrypoint.sh
index 65debac1..23b6b7ab 100644
--- a/docker/client/entrypoint.sh
+++ b/docker/client/entrypoint.sh
@@ -46,12 +46,14 @@ if [ -n "$NODE_KEY" ]; then
   START_COMMAND="$START_COMMAND --node-key $NODE_KEY"
 fi
 
-if [ "$DEFAULT_BOOTNODE" = "yes" ]; then
-  START_COMMAND="$START_COMMAND --bootnodes /ip4/3.21.88.38/tcp/30333/p2p/12D3KooWPaen1igo2WYUFCt3EAg4AWjWoMYgmr4tCa2Yb1WfgoDB"
-elif [ -n "$BOOTNODES" ]; then
+if [ -n "$BOOTNODES" ]; then
   START_COMMAND="$START_COMMAND --bootnodes $BOOTNODES"
 fi
 
+if [ -n "$ZERO_GAS_TX_POOL" ]; then
+  START_COMMAND="$START_COMMAND --zero-gas-tx-pool $ZERO_GAS_TX_POOL"
+fi
+
 echo "Starting $CHAIN_TARGET chain"
 eval $START_COMMAND