diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim
index db8e3871b..72f609970 100644
--- a/beacon_chain/beacon_node.nim
+++ b/beacon_chain/beacon_node.nim
@@ -25,7 +25,7 @@ import
   beacon_node_common, beacon_node_types, block_pools/block_pools_types,
   nimbus_binary_common,
   mainchain_monitor, version, ssz/[merkleization], sszdump,
-  sync_protocol, request_manager, validator_keygen, interop, statusbar,
+  sync_protocol, request_manager, keystore_directories, interop, statusbar,
   sync_manager, state_transition,
   validator_duties, validator_api, attestation_aggregation
 
diff --git a/beacon_chain/validator_keygen.nim b/beacon_chain/keystore_directories.nim
similarity index 100%
rename from beacon_chain/validator_keygen.nim
rename to beacon_chain/keystore_directories.nim
diff --git a/beacon_chain/validator_client.nim b/beacon_chain/validator_client.nim
index 84a8e35d4..d30698e62 100644
--- a/beacon_chain/validator_client.nim
+++ b/beacon_chain/validator_client.nim
@@ -21,7 +21,7 @@ import
   eth2_network, eth2_discovery, validator_pool, beacon_node_types,
   nimbus_binary_common,
   version, ssz/merkleization,
-  sync_manager, validator_keygen,
+  sync_manager, keystore_directories,
   spec/eth2_apis/validator_callsigs_types,
   eth2_json_rpc_serialization
 
diff --git a/beacon_chain/validator_duties.nim b/beacon_chain/validator_duties.nim
index 7fabf5d21..382105b03 100644
--- a/beacon_chain/validator_duties.nim
+++ b/beacon_chain/validator_duties.nim
@@ -20,7 +20,7 @@ import
   # Local modules
   spec/[datatypes, digest, crypto, beaconstate, helpers, validator, network],
   conf, time, validator_pool, state_transition,
-  attestation_pool, block_pool, eth2_network, validator_keygen,
+  attestation_pool, block_pool, eth2_network, keystore_directories,
   beacon_node_common, beacon_node_types, nimbus_binary_common,
   mainchain_monitor, version, ssz/merkleization, interop,
   attestation_aggregation, sync_manager, sszdump
diff --git a/scripts/launch_local_testnet.sh b/scripts/launch_local_testnet.sh
index afea81220..8e052c8e6 100755
--- a/scripts/launch_local_testnet.sh
+++ b/scripts/launch_local_testnet.sh
@@ -181,8 +181,8 @@ dump_logs() {
 
 PIDS=""
 NODES_WITH_VALIDATORS=${NODES_WITH_VALIDATORS:-4}
-SYSTEM_VALIDATORS=$((TOTAL_VALIDATORS - USER_VALIDATORS))
-VALIDATORS_PER_NODE=$((SYSTEM_VALIDATORS / NODES_WITH_VALIDATORS))
+SYSTEM_VALIDATORS=$(( TOTAL_VALIDATORS - USER_VALIDATORS ))
+VALIDATORS_PER_NODE=$(( SYSTEM_VALIDATORS / NODES_WITH_VALIDATORS ))
 BOOTSTRAP_TIMEOUT=10 # in seconds
 
 for NUM_NODE in $(seq 0 $((NUM_NODES - 1))); do
@@ -210,14 +210,15 @@ for NUM_NODE in $(seq 0 $((NUM_NODES - 1))); do
 	mkdir -p "${NODE_DATA_DIR}/secrets"
 
 	if [[ $NUM_NODE -lt $NODES_WITH_VALIDATORS ]]; then
-		for VALIDATOR in $(ls ${DEPOSITS_DIR}/* | tail -n +$(( $USER_VALIDATORS + ($VALIDATORS_PER_NODE * $NUM_NODE) + 1 )) | head -n $VALIDATORS_PER_NODE); do
-			cp -ar "$VALIDATOR" "${NODE_DATA_DIR}/validators/"
+		for VALIDATOR in $(ls ${DEPOSITS_DIR} | tail -n +$(( $USER_VALIDATORS + ($VALIDATORS_PER_NODE * $NUM_NODE) + 1 )) | head -n $VALIDATORS_PER_NODE); do
+			cp -ar "${DEPOSITS_DIR}/$VALIDATOR" "${NODE_DATA_DIR}/validators/"
 			cp -a "${SECRETS_DIR}/${VALIDATOR}" "${NODE_DATA_DIR}/secrets"
 		done
 	fi
 
 	./build/beacon_node \
-		--nat:extip:127.0.0.1 \
+		--non-interactive \
+    --nat:extip:127.0.0.1 \
 		--log-level="${LOG_LEVEL}" \
 		--tcp-port=$(( BASE_PORT + NUM_NODE )) \
 		--udp-port=$(( BASE_PORT + NUM_NODE )) \