diff --git a/app/data/config/mainnet-eth/lighthouse.env b/app/data/config/mainnet-eth/lighthouse.env
index 7a07b987..11fc6b69 100644
--- a/app/data/config/mainnet-eth/lighthouse.env
+++ b/app/data/config/mainnet-eth/lighthouse.env
@@ -1,6 +1,3 @@
-# Enable remote debugging using dlv
-CERC_REMOTE_DEBUG=false
-
 # Enable startup script debug output.
 CERC_SCRIPT_DEBUG=false
 
@@ -12,7 +9,10 @@ LIGHTHOUSE_OPTS=""
 #LIGHTHOUSE_ENR_ADDRESS=""
 
 # --checkpoint-sync-url
-LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://beaconstate.ethstaker.cc
+LIGHTHOUSE_CHECKPOINT_SYNC_URL="https://beaconstate.ethstaker.cc"
+
+# --checkpoint-sync-url-timeout
+LIGHTHOUSE_CHECKPOINT_SYNC_URL_TIMEOUT=300
 
 # --datadir
 LIGHTHOUSE_DATADIR=/data
diff --git a/app/data/config/mainnet-eth/scripts/run-geth.sh b/app/data/config/mainnet-eth/scripts/run-geth.sh
index dafa77ae..5e0b6786 100755
--- a/app/data/config/mainnet-eth/scripts/run-geth.sh
+++ b/app/data/config/mainnet-eth/scripts/run-geth.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
+if [[ "true" == "$CERC_SCRIPT_DEBUG" ]]; then
     set -x
 fi
 
@@ -37,7 +37,7 @@ $START_CMD \
   --cache=${GETH_CACHE} \
   --cache.gc=${GETH_CACHE_GC} \
   --cache.database=${GETH_CACHE_DB} \
-  --cache.trie=${GETH_CACHE_TRIE}
+  --cache.trie=${GETH_CACHE_TRIE} \
   --authrpc.addr='0.0.0.0' \
   --authrpc.vhosts='*'  \
   --authrpc.jwtsecret="${GETH_JWTSECRET}" \
diff --git a/app/data/config/mainnet-eth/scripts/run-lighthouse.sh b/app/data/config/mainnet-eth/scripts/run-lighthouse.sh
index af98771b..efda735b 100755
--- a/app/data/config/mainnet-eth/scripts/run-lighthouse.sh
+++ b/app/data/config/mainnet-eth/scripts/run-lighthouse.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
+if [[ "true" == "$CERC_SCRIPT_DEBUG" ]]; then
     set -x
 fi
 
@@ -10,13 +10,14 @@ fi
 
 exec lighthouse bn \
   --checkpoint-sync-url "$LIGHTHOUSE_CHECKPOINT_SYNC_URL" \
+  --checkpoint-sync-url-timeout ${LIGHTHOUSE_CHECKPOINT_SYNC_URL_TIMEOUT} \
   --datadir "$LIGHTHOUSE_DATADIR" \
   --debug-level $LIGHTHOUSE_DEBUG_LEVEL \
   --disable-deposit-contract-sync \
   --disable-upnp \
   --enr-tcp-port $LIGHTHOUSE_NETWORK_PORT \
   --enr-udp-port $LIGHTHOUSE_NETWORK_PORT \
-  --execution-endpoint "$EXECUTION_ENDPOINT" \
+  --execution-endpoint "$LIGHTHOUSE_EXECUTION_ENDPOINT" \
   --execution-jwt /etc/mainnet-eth/jwtsecret \
   --http \
   --http-address 0.0.0.0 \