diff --git a/Makefile b/Makefile
index 76a98664d..260ca83c6 100644
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,7 @@ clean-testnet0:
 clean-testnet1:
 	rm -rf build/data/testnet1*
 
-testnet0 testnet1: | beacon_node build deps
+testnet0 testnet1: | beacon_node
 	build/beacon_node \
 		--network=$@ \
 		--log-level="$(LOG_LEVEL)" \
@@ -173,21 +173,21 @@ testnet0 testnet1: | beacon_node build deps
 clean-altona:
 	rm -rf build/data/shared_altona*
 
-altona-deposit: | beacon_node build deps
+altona-deposit: | beacon_node
 	build/beacon_node deposits create \
 		--network=altona \
 		--count=$(VALIDATORS)	\
 		--ask-for-key \
 		--web3-url=$(GOERLI_WEB3_URL)
 
-altona: | beacon_node build deps
+altona: | beacon_node
 	build/beacon_node \
 		--network=altona \
 		--log-level="$(LOG_LEVEL)" \
 		--data-dir=build/data/shared_altona_$(NODE_ID) \
 		$(GOERLI_TESTNETS_PARAMS) $(NODE_PARAMS)
 
-altona-dev: | beacon_node build deps
+altona-dev: | beacon_node
 	build/beacon_node \
 		--network=altona \
 		--log-level="DEBUG; TRACE:discv5,networking; REQUIRED:none; DISABLED:none" \
diff --git a/docker/shared_testnet/entry_point.sh b/docker/shared_testnet/entry_point.sh
index 594aafe68..29502632b 100755
--- a/docker/shared_testnet/entry_point.sh
+++ b/docker/shared_testnet/entry_point.sh
@@ -90,7 +90,7 @@ if [[ "$BUILD" == "1" ]]; then
   git pull
   # don't use too much RAM
   make update
-  make LOG_LEVEL="TRACE" NIMFLAGS="-d:insecure -d:testnet_servers_image --parallelBuild:1" SCRIPT_PARAMS="--skipGoerliKey --writeLogFile=false --buildOnly" ${NETWORK}
+  make LOG_LEVEL="TRACE" NIMFLAGS="-d:insecure -d:testnet_servers_image --parallelBuild:1" beacon_node
 fi
 
 #######
@@ -99,8 +99,7 @@ fi
 
 if [[ "$RUN" == "1" ]]; then
   cd /root/.cache/nimbus/nim-beacon-chain
-  echo $(make SCRIPT_PARAMS="--skipGoerliKey --writeLogFile=false --runOnly --printCmdOnly" ${NETWORK} | tail -n 1) ${EXTRA_ARGS}
   # make sure Docker's SIGINT reaches the beacon_node binary
-  eval $(make SCRIPT_PARAMS="--skipGoerliKey --writeLogFile=false --runOnly --printCmdOnly" ${NETWORK} | tail -n 1) ${EXTRA_ARGS}
+  exec build/beacon_node --network=${NETWORK} --data-dir=build/data/shared_${NETWORK}_0 ${EXTRA_ARGS}
 fi