diff --git a/devnet/eth-devnet.yaml b/devnet/eth-devnet.yaml
index b0c8251d4..1f0e942c8 100644
--- a/devnet/eth-devnet.yaml
+++ b/devnet/eth-devnet.yaml
@@ -48,11 +48,12 @@ spec:
               port: rpc
         - name: tests
           image: eth-node
+          stdin: true
           command:
             - /bin/sh
             - -c
-            - "npm run migrate && npx truffle exec scripts/deploy_test_token.js && nc -l -p 2000 && sleep infinity"
-          startupProbe:
+            - "npm run migrate && npx truffle exec scripts/deploy_test_token.js && nc -lkp 2000 0.0.0.0"
+          readinessProbe:
             periodSeconds: 1
             failureThreshold: 300
             tcpSocket:
diff --git a/devnet/solana-devnet.yaml b/devnet/solana-devnet.yaml
index db633274a..61bc89892 100644
--- a/devnet/solana-devnet.yaml
+++ b/devnet/solana-devnet.yaml
@@ -77,11 +77,12 @@ spec:
             httpGet:
               port: rpc
               path: /health
+            periodSeconds: 1
         - name: setup
           image: solana-client
           command:
             - /usr/src/solana/devnet_setup.sh
-          startupProbe:
+          readinessProbe:
             tcpSocket:
               port: 2000
             periodSeconds: 1
diff --git a/solana/devnet_setup.sh b/solana/devnet_setup.sh
index 38c52dfa9..826eb398f 100755
--- a/solana/devnet_setup.sh
+++ b/solana/devnet_setup.sh
@@ -47,7 +47,4 @@ spl-token mint "$token" 10000000000 "$account"
 retry client create-bridge "$bridge_address" "$initial_guardian" 86400 100
 
 # Let k8s startup probe succeed
-nc -l -p 2000
-
-# Keep the container alive for interactive CLI usage
-sleep infinity
+nc -k -l -p 2000