diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh
index 62ead0b166..8f17a8f70b 100755
--- a/ci/testnet-deploy.sh
+++ b/ci/testnet-deploy.sh
@@ -77,7 +77,7 @@ EARLYOOM_INSTALL_CMD="\
   wget --retry-connrefused --waitretry=1 \
     --read-timeout=20 --timeout=15 --tries=5 \
     -O install-earlyoom.sh \
-    https://raw.githubusercontent.com/solana-labs/solana/master/ci/install-earlyoom.sh; \
+    https://raw.githubusercontent.com/solana-labs/solana/master/scripts/install-earlyoom.sh; \
   bash install-earlyoom.sh \
 "
 SNAP_INSTALL_CMD="$EARLYOOM_INSTALL_CMD; $SNAP_INSTALL_CMD"
diff --git a/net/net.sh b/net/net.sh
index 1fe566fecf..eb758b5e80 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -165,9 +165,7 @@ stop_node() {
     set -x
     ssh "${sshOptions[@]}" "$ipAddress" "
       set -x;
-      pkill -9 solana-;
-      pkill -9 validator;
-      pkill -9 leader;
+      pkill -9 solana- remote_ oom-monitor
     "
   ) || true
 }
diff --git a/net/remote/remote_client.sh b/net/remote/remote_client.sh
index 9fa60e37cf..114f10b736 100755
--- a/net/remote/remote_client.sh
+++ b/net/remote/remote_client.sh
@@ -10,6 +10,9 @@ PATH="$HOME"/.cargo/bin:"$PATH"
 rsync -vPrz "$1":~/.cargo/bin/solana* ~/.cargo/bin/
 
 numNodes=1 # TODO: Pass this in
-export USE_INSTALL=1
 
-multinode-demo/client.sh "$1":~/solana $numNodes --loop -s 600 --sustained >client.log 2>&1 &
+./script/install-earlyoom.sh
+./scripts/oom-monitor.sh  > oom-monitor.log 2>&1 &
+
+export USE_INSTALL=1
+multinode-demo/client.sh "$1":~/solana $numNodes --loop -s 600 --sustained > client.log 2>&1 &
diff --git a/net/remote/remote_leader.sh b/net/remote/remote_leader.sh
index 79e66110b1..077fd7c414 100755
--- a/net/remote/remote_leader.sh
+++ b/net/remote/remote_leader.sh
@@ -6,10 +6,13 @@ loadConfigFile
 
 PATH="$HOME"/.cargo/bin:"$PATH"
 
+./fetch-perf-libs.sh
+
+./script/install-earlyoom.sh
+./scripts/oom-monitor.sh  > oom-monitor.log 2>&1 &
+
 export USE_INSTALL=1
 export SOLANA_CUDA=1
-
-./fetch-perf-libs.sh
 ./multinode-demo/setup.sh
-./multinode-demo/drone.sh >drone.log 2>&1 &
-./multinode-demo/leader.sh >leader.log 2>&1 &
+./multinode-demo/drone.sh > drone.log 2>&1 &
+./multinode-demo/leader.sh > leader.log 2>&1 &
diff --git a/net/remote/remote_validator.sh b/net/remote/remote_validator.sh
index 7f500ee317..fd4afd9cfc 100755
--- a/net/remote/remote_validator.sh
+++ b/net/remote/remote_validator.sh
@@ -10,6 +10,9 @@ PATH="$HOME"/.cargo/bin:"$PATH"
 
 rsync -vPrz "$1":~/.cargo/bin/solana* ~/.cargo/bin/
 
+./script/install-earlyoom.sh
+./scripts/oom-monitor.sh  > oom-monitor.log 2>&1 &
+
 export USE_INSTALL=1
 ./multinode-demo/setup.sh
 ./multinode-demo/validator.sh "$1":~/solana "$1" >validator.log 2>&1 &
diff --git a/ci/install-earlyoom.sh b/scripts/install-earlyoom.sh
similarity index 100%
rename from ci/install-earlyoom.sh
rename to scripts/install-earlyoom.sh