diff --git a/security/test_bmc_connections.robot b/security/test_bmc_connections.robot
index 0d7d189..e1080ac 100644
--- a/security/test_bmc_connections.robot
+++ b/security/test_bmc_connections.robot
@@ -21,7 +21,9 @@
 
 Suite Setup   Redfish.Logout
 
-Variables  ../gui/data/gui_variables.py
+Variables     ../gui/data/gui_variables.py
+
+Force Tags    BMC_Connections
 
 *** Variables ***
 
diff --git a/security/test_bmc_expire_password.robot b/security/test_bmc_expire_password.robot
index 0d2fa75..b5fa0aa 100644
--- a/security/test_bmc_expire_password.robot
+++ b/security/test_bmc_expire_password.robot
@@ -12,7 +12,6 @@
 
 Force Tags       BMC_Expire_Password
 
-
 *** Variables ***
 
 # If user re-tries more than 5 time incorrectly, the user gets locked for 5 minutes.
diff --git a/security/test_bmc_network_security.robot b/security/test_bmc_network_security.robot
index ef4c07a..6ab00dd 100644
--- a/security/test_bmc_network_security.robot
+++ b/security/test_bmc_network_security.robot
@@ -18,7 +18,7 @@
 
 Suite Setup             Suite Setup Execution
 
-Force Tags              Network_Nping
+Force Tags              BMC_Network_Security
 
 *** Variables ***
 
diff --git a/security/test_bmc_ssh_security.robot b/security/test_bmc_ssh_security.robot
index 88accd0..9e63ae5 100644
--- a/security/test_bmc_ssh_security.robot
+++ b/security/test_bmc_ssh_security.robot
@@ -4,6 +4,8 @@
 Resource         ../lib/resource.robot
 Resource         ../lib/openbmc_ffdc_methods.robot
 
+Force Tags       BMC_SSH_Security
+
 *** Variables ***
 
 @{allowed_shell_rcs}   ${255}
diff --git a/security/test_bmcweb_security.robot b/security/test_bmcweb_security.robot
index 3427e5b..8fcaed3 100644
--- a/security/test_bmcweb_security.robot
+++ b/security/test_bmcweb_security.robot
@@ -8,6 +8,8 @@
 Test Setup       Test Setup Execution
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       BMCweb_Security
+
 *** Variables ***
 
 ${LOOP_COUNT}   4