diff --git a/docker-compose.regtest.yml b/docker-compose.regtest.yml
index b7fdafd..de6a310 100644
--- a/docker-compose.regtest.yml
+++ b/docker-compose.regtest.yml
@@ -32,10 +32,9 @@ services:
     volumes:
       - txoo_regtest:/root/.txoo/
       - bitcoin_regtest:/root/.bitcoin/
-    command:
-      - -r http://rpcuser:VLSsigner1@bitcoind:38332
     environment:
       - BITCOIN_NETWORK=regtest
+      - BITCOIND_RPC_URL=http://rpcuser:VLSsigner1@bitcoind:38332
 
   vls:
     container_name: vlsd-regtest
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ad17b5..9754e08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,8 +47,6 @@ services:
     image: txood:${IMAGE_TAG:-latest}
     container_name: txood-test
     restart: unless-stopped
-    command:
-      - -r http://rpcuser:VLSsigner1@bitcoind:18332
     networks:
       - lightning
     volumes:
@@ -59,6 +57,7 @@ services:
         condition: service_healthy
     environment:
       - BITCOIN_NETWORK=testnet
+      - BITCOIND_RPC_URL=http://rpcuser:VLSsigner1@bitcoind:18332
 
   vls:
     build:
diff --git a/txood/entrypoint.sh b/txood/entrypoint.sh
index faf4783..69ee603 100644
--- a/txood/entrypoint.sh
+++ b/txood/entrypoint.sh
@@ -1,11 +1,19 @@
 #!/bin/sh
-set -e
+
+set -ex
 
 if [ $(echo "$1" | cut -c1) = "-" ]; then
   echo "$0: assuming arguments for txood"
 
-  set -- txood --network $BITCOIN_NETWORK "$@"
+  set -- txood "$@"
+fi
+
+if [ $(echo "$1" | cut -c1) = "-" ] || [ "$1" = "txood" ]; then
+  echo "$0: setting network to $BITCOIN_NETWORK"
+  echo "$0: setting RPC URL to $BITCOIND_RPC_URL"
+
+  set -- "$@" --network $BITCOIN_NETWORK -r $BITCOIND_RPC_URL
 fi
 
 echo
-exec "$@"
\ No newline at end of file
+exec "$@"