diff --git a/security/test_bmc_connections.robot b/security/test_bmc_connections.robot
index e1080ac..9d1e7a9 100644
--- a/security/test_bmc_connections.robot
+++ b/security/test_bmc_connections.robot
@@ -23,7 +23,7 @@
 
 Variables     ../gui/data/gui_variables.py
 
-Force Tags    BMC_Connections
+Test Tags    BMC_Connections
 
 *** Variables ***
 
diff --git a/security/test_bmc_expire_password.robot b/security/test_bmc_expire_password.robot
index 00453f8..b7820a9 100644
--- a/security/test_bmc_expire_password.robot
+++ b/security/test_bmc_expire_password.robot
@@ -10,7 +10,7 @@
 
 Test Setup       Set Account Lockout Threshold
 
-Force Tags       BMC_Expire_Password
+Test Tags       BMC_Expire_Password
 
 *** Variables ***
 
diff --git a/security/test_bmc_network_security.robot b/security/test_bmc_network_security.robot
index 3668ef7..fc92791 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              BMC_Network_Security
+Test Tags              BMC_Network_Security
 
 *** Variables ***
 
diff --git a/security/test_bmc_ssh_security.robot b/security/test_bmc_ssh_security.robot
index 9e63ae5..14a7b34 100644
--- a/security/test_bmc_ssh_security.robot
+++ b/security/test_bmc_ssh_security.robot
@@ -4,7 +4,7 @@
 Resource         ../lib/resource.robot
 Resource         ../lib/openbmc_ffdc_methods.robot
 
-Force Tags       BMC_SSH_Security
+Test Tags       BMC_SSH_Security
 
 *** Variables ***
 
diff --git a/security/test_bmcweb_security.robot b/security/test_bmcweb_security.robot
index 8fcaed3..5f38829 100644
--- a/security/test_bmcweb_security.robot
+++ b/security/test_bmcweb_security.robot
@@ -8,7 +8,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       BMCweb_Security
+Test Tags       BMCweb_Security
 
 *** Variables ***
 
diff --git a/security/test_slp.robot b/security/test_slp.robot
index f0892f3..2436276 100644
--- a/security/test_slp.robot
+++ b/security/test_slp.robot
@@ -9,7 +9,7 @@
 # Get the SLP services available, make it suite global.
 Suite Setup     Suite Setup Execution
 
-Force Tags  SLP_Service_Test
+Test Tags  SLP_Service_Test
 
 *** Variables ***
 ${service_types}    findsrvtypes