diff --git a/scripts/test_all.sh b/scripts/test_all.sh
index ccb19a59..53bd9d8e 100755
--- a/scripts/test_all.sh
+++ b/scripts/test_all.sh
@@ -7,7 +7,10 @@ run_test() {
 }
 
 cleanup() {
-    make delete-e2e-firewall
+    if [[ -z "$CLEANUP_DONE" ]]; then
+        make delete-e2e-firewall
+        CLEANUP_DONE=1
+    fi
 }
 
 # Set trap to ensure cleanup is run on script exit
diff --git a/tod_scripts b/tod_scripts
index e8c8e15c..f6da35dc 160000
--- a/tod_scripts
+++ b/tod_scripts
@@ -1 +1 @@
-Subproject commit e8c8e15ce833a169837f8d1513bd2185af2c645b
+Subproject commit f6da35dcb089fced7bcaf2a3c6ad29929f0d126c