diff --git a/Makefile b/Makefile
index 40f1939..5e9d8c2 100755
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@
 
 #Only supported in full mode
 system-scale-test: ROBOT_FILE := K8S_SystemTest.robot
-system-scale-test: ROBOT_MISC_ARGS += -X -i functional $(ROBOT_DEBUG_LOG_OPT)
+system-scale-test: ROBOT_MISC_ARGS += -X -i functional $(ROBOT_DEBUG_LOG_OPT) -v teardown_device:true
 system-scale-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULT_PON_FILE)
 system-scale-test: voltha-test
 
diff --git a/tests/functional/K8S_SystemTest.robot b/tests/functional/K8S_SystemTest.robot
index d4b902a..13c55bc 100644
--- a/tests/functional/K8S_SystemTest.robot
+++ b/tests/functional/K8S_SystemTest.robot
@@ -37,6 +37,8 @@
 ${rwcore_pod_label_value}    rw-core
 ${ofagent_pod_label_value}    ofagent
 ${adapter_openolt_pod_label_value}    adapter-open-olt
+${teardown_device}      false
+${has_dataplane}        false
 
 # Per-test logging on failure is turned off by default; set this variable to enable
 ${container_log_dir}    ${None}
@@ -64,6 +66,9 @@
     Scale ETCD    ${ETCD_namespace}    ${desired_ETCD_cluster_size}
     Wait Until Keyword Succeeds    ${timeout}    2s
     ...    Validate ETCD Size    ${ETCD_namespace}    ${desired_ETCD_cluster_size}
+    # Perform the sanity-test again
+    Run Keyword If    ${has_dataplane}    Clean Up Linux
+    Wait Until Keyword Succeeds    ${timeout}    2s    Perform Sanity Test
 
 ETCD Failure Test
     [Documentation]    Failure Scenario Test: ETCD Crash