diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status-internal.sh b/app/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status-internal.sh
index 52c61a39..628d7d48 100755
--- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status-internal.sh
+++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status-internal.sh
@@ -4,7 +4,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
     set -x
 fi
 export LIGHTHOUSE_BASE_URL="http://fixturenet-eth-lighthouse-1:8001"
-export GETH_BASE_URL="http://fixturenet-eth-geth-1-1:8545"
+export GETH_BASE_URL="http://fixturenet-eth-geth-1:8545"
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 $SCRIPT_DIR/status.sh
diff --git a/app/deploy_system.py b/app/deploy_system.py
index 7c2e5b7e..b7fc69a6 100644
--- a/app/deploy_system.py
+++ b/app/deploy_system.py
@@ -109,7 +109,7 @@ def command(ctx, include, exclude, cluster, command, extra_args):
             command_to_exec = extra_args_list[1:]
             container_exec_env = {
                 "CERC_SCRIPT_DEBUG": "true"
-            } if debug else None
+            } if debug else {}
             if verbose:
                 print(f"Running compose exec {service_name} {command_to_exec}")
             docker.compose.execute(service_name, command_to_exec, envs=container_exec_env)