diff --git a/Robot-Framework/resources/ssh_keywords.resource b/Robot-Framework/resources/ssh_keywords.resource
index 4fb98d1..70eb161 100644
--- a/Robot-Framework/resources/ssh_keywords.resource
+++ b/Robot-Framework/resources/ssh_keywords.resource
@@ -58,7 +58,6 @@ Connect
 Verify Systemctl status
     [Arguments]    ${range}=60
     [Documentation]    Check is systemctl running with given loop ${range}
-    [Setup]     Connect
     ${start_time}=    Get Time	epoch
     FOR    ${i}    IN RANGE    ${range}
         ${output}=    Execute Command    systemctl status
diff --git a/Robot-Framework/test-suites/bat-tests/others.robot b/Robot-Framework/test-suites/bat-tests/others.robot
index f8a04c7..6000488 100644
--- a/Robot-Framework/test-suites/bat-tests/others.robot
+++ b/Robot-Framework/test-suites/bat-tests/others.robot
@@ -32,6 +32,7 @@ Check QSPI version
 
 Check systemctl status
     [Documentation]    Verify systemctl status is running
-    [Tags]             bat  nuc  orin-agx  orin-nx
+    [Tags]             bat  SP-T104  nuc  orin-agx  orin-nx
+    [Setup]     Connect
     Verify Systemctl status
     [Teardown]  Close All Connections