diff --git a/multinode-demo/leader.sh b/multinode-demo/leader.sh
index b489b4fbfe..70a2bee217 100755
--- a/multinode-demo/leader.sh
+++ b/multinode-demo/leader.sh
@@ -6,13 +6,9 @@ export RUST_LOG=${RUST_LOG:-solana=info}
 set -x
 [[ $(uname) = Linux ]] && sudo sysctl -w net.core.rmem_max=26214400
 
-IPADDR="$(ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}')"
+IPADDR="$(ifconfig | awk '/inet (addr)?/ {print $2}' | cut -d: -f2 | grep -v '127.0.0.1')"
 
-if [ -z "$IPADDR" ]; then
-    IPADDR="$(ifconfig  | grep 'inet '| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $2}')"
-fi
-
-cp leader-$IPADDR.json leader.json
+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 f2a704bd29..61b61ab27b 100755
--- a/multinode-demo/setup.sh
+++ b/multinode-demo/setup.sh
@@ -5,11 +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
 
-IPADDR="$(ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}')"
+IPADDR="$(ifconfig | awk '/inet (addr)?/ {print $2}' | cut -d: -f2 | grep -v '127.0.0.1')"
 
-if [ -z "$IPADDR" ]; then
-    IPADDR="$(ifconfig  | grep 'inet '| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $2}')"
-fi
-
-cargo run --release --bin solana-fullnode-config -- -d > leader-$IPADDR.json
-cargo run --release --bin solana-fullnode-config -- -b 9000 -d > validator-$IPADDR.json
+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 64961ed4f8..298f0c9825 100755
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -16,11 +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  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}')"
-
-if [ -z "$IPADDR" ]; then
-    IPADDR="$(ifconfig  | grep 'inet '| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $2}')"
-fi
+IPADDR="$(ifconfig | awk '/inet (addr)?/ {print $2}' | cut -d: -f2 | grep -v '127.0.0.1')"
 
 cargo run --release --bin solana-fullnode -- \
-    -l validator-$IPADDR.json -v leader.json < genesis.log tx-*.log
+    -l validator-"$IPADDR".json -v leader.json < genesis.log tx-*.log