diff --git a/multinode-demo/bootstrap-leader.sh b/multinode-demo/bootstrap-leader.sh
index 6c666964b..ee550b4fd 100755
--- a/multinode-demo/bootstrap-leader.sh
+++ b/multinode-demo/bootstrap-leader.sh
@@ -20,6 +20,9 @@ while [[ -n $1 ]]; do
     if [[ $1 = --init-complete-file ]]; then
       args+=("$1" "$2")
       shift 2
+    elif [[ $1 = --gossip-port ]]; then
+      args+=("$1" "$2")
+      shift 2
     else
       echo "Unknown argument: $1"
       $program --help
@@ -60,7 +63,6 @@ ledger_config_dir="$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger
 args+=(
   --accounts "$SOLANA_CONFIG_DIR"/bootstrap-leader-accounts
   --enable-rpc-exit
-  --gossip-port 8001
   --identity "$identity_keypair"
   --ledger "$ledger_config_dir"
   --rpc-port 8899
@@ -69,6 +71,7 @@ args+=(
   --voting-keypair "$vote_keypair"
   --rpc-drone-address 127.0.0.1:9900
 )
+default_arg --gossip-port 8001
 
 identity_pubkey=$($solana_keygen pubkey "$identity_keypair")
 export SOLANA_METRICS_HOST_ID="$identity_pubkey"
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index 561ee6f18..c5f95a5ea 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -166,7 +166,6 @@ local|tar|skip)
       ./multinode-demo/setup.sh "${args[@]}"
     fi
     args=(
-      --enable-rpc-exit
       --gossip-port "$entrypointIp":8001
       --init-complete-file "$initCompleteFile"
     )
@@ -176,7 +175,7 @@ local|tar|skip)
     fi
     # shellcheck disable=SC2206 # Don't want to double quote $extraNodeArgs
     args+=($extraNodeArgs)
-    nohup ./multinode-demo/validator.sh --bootstrap-leader "${args[@]}" > fullnode.log 2>&1 &
+    nohup ./multinode-demo/bootstrap-leader.sh "${args[@]}" > fullnode.log 2>&1 &
     pid=$!
     oom_score_adj "$pid" 1000
     waitForNodeToInit