diff --git a/justfile b/justfile
index f8ffde7fd..0da383e52 100644
--- a/justfile
+++ b/justfile
@@ -358,8 +358,6 @@ e2e-leader-follower-up test="brlc" release_flag="--release":
         npx hardhat test test/leader-follower-{{test}}.test.ts --bail --network stratus --show-stack-traces
         if [ $? -ne 0 ]; then
             just _log "Tests failed"
-            killport 3000 -s sigterm
-            killport 3001 -s sigterm
             exit 1
         else
             just _log "Tests passed successfully"
@@ -544,6 +542,8 @@ stratus-test-coverage output="":
     -rm -r temp_3001-rocksdb
     -docker compose down -v
     just e2e-leader-follower-up kafka " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -552,6 +552,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up deploy " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -560,6 +562,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up brlc " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -568,6 +572,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up change " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -576,6 +582,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up miner " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -584,6 +592,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up importer " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log