diff --git a/multinode-demo/leader.sh b/multinode-demo/leader.sh
index 6a9f72b48999b6..70a2bee2170779 100755
--- a/multinode-demo/leader.sh
+++ b/multinode-demo/leader.sh
@@ -6,5 +6,9 @@ export RUST_LOG=${RUST_LOG:-solana=info}
 set -x
 [[ $(uname) = Linux ]] && sudo sysctl -w net.core.rmem_max=26214400
 
+IPADDR="$(ifconfig | awk '/inet (addr)?/ {print $2}' | cut -d: -f2 | grep -v '127.0.0.1')"
+
+cp leader-"$IPADDR".json leader.json
+
 cargo run --release --bin solana-fullnode -- \
       -l leader.json < genesis.log tx-*.log > tx-"$(date -u +%Y%m%d%k%M%S%N)".log
diff --git a/multinode-demo/setup.sh b/multinode-demo/setup.sh
index c2f5fa1da999f4..61b61ab27b4d2d 100755
--- a/multinode-demo/setup.sh
+++ b/multinode-demo/setup.sh
@@ -5,5 +5,7 @@ TOKENS=${1:-1000000000}
 cargo run --release --bin solana-mint-demo <<<"${TOKENS}" > mint-demo.json
 cargo run --release --bin solana-genesis-demo < mint-demo.json > genesis.log
 
-cargo run --release --bin solana-fullnode-config -- -d > leader.json
-cargo run --release --bin solana-fullnode-config -- -b 9000 -d > validator.json
+IPADDR="$(ifconfig | awk '/inet (addr)?/ {print $2}' | cut -d: -f2 | grep -v '127.0.0.1')"
+
+cargo run --release --bin solana-fullnode-config -- -d > leader-"$IPADDR".json
+cargo run --release --bin solana-fullnode-config -- -b 9000 -d > validator-"$IPADDR".json
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
index be854970d246d4..298f0c98255444 100755
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -16,5 +16,7 @@ rsync -v "$LEADER"/{mint-demo.json,leader.json,genesis.log,tx-*.log} . || exit $
 # if RUST_LOG is unset, default to info
 export RUST_LOG=${RUST_LOG:-solana=info}
 
+IPADDR="$(ifconfig | awk '/inet (addr)?/ {print $2}' | cut -d: -f2 | grep -v '127.0.0.1')"
+
 cargo run --release --bin solana-fullnode -- \
-    -l validator.json -v leader.json < genesis.log tx-*.log
+    -l validator-"$IPADDR".json -v leader.json < genesis.log tx-*.log