diff --git a/gui/gui_test/gui_header/test_gui_header.robot b/gui/gui_test/gui_header/test_gui_header.robot
index 5e7b22a..3dbed36 100644
--- a/gui/gui_test/gui_header/test_gui_header.robot
+++ b/gui/gui_test/gui_header/test_gui_header.robot
@@ -7,7 +7,7 @@
 Test Setup      Launch Browser And Login GUI
 Suite Teardown  Close Browser
 
-Force Tags      GUI_Header
+Test Tags      GUI_Header
 
 *** Variables ***
 
diff --git a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
index a2bf226..5fc27cf 100644
--- a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
+++ b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Profile_Settings_Sub_Menu
+Test Tags      Profile_Settings_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
index 1cb457d..b486da7 100644
--- a/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
+++ b/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
@@ -7,7 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Inventory_And_Leds_Sub_Menu
+Test Tags      Inventory_And_Leds_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
index d55934e..21357b0 100644
--- a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
+++ b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
@@ -6,7 +6,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Sensors_Sub_Menu
+Test Tags      Sensors_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/logs_and_services_menu/test_event_logs_sub_menu.robot b/gui/gui_test/logs_and_services_menu/test_event_logs_sub_menu.robot
index 61a77c3..4cecdd1 100755
--- a/gui/gui_test/logs_and_services_menu/test_event_logs_sub_menu.robot
+++ b/gui/gui_test/logs_and_services_menu/test_event_logs_sub_menu.robot
@@ -9,7 +9,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Suite Teardown Execution
 
-Force Tags      Event_Logs_Sub_Menu
+Test Tags      Event_Logs_Sub_Menu
 
 *** Variables ***
 ${xpath_event_logs_heading}       //h1[text()="Event logs"]
diff --git a/gui/gui_test/logs_and_services_menu/test_progress_logs_sub_menu.robot b/gui/gui_test/logs_and_services_menu/test_progress_logs_sub_menu.robot
index cae8335..541193e 100644
--- a/gui/gui_test/logs_and_services_menu/test_progress_logs_sub_menu.robot
+++ b/gui/gui_test/logs_and_services_menu/test_progress_logs_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Progress_Logs_Sub_Menu
+Test Tags      Progress_Logs_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/notices_menu/test_notices_menu.robot b/gui/gui_test/notices_menu/test_notices_menu.robot
index 6d6d0f4..d82cb91 100644
--- a/gui/gui_test/notices_menu/test_notices_menu.robot
+++ b/gui/gui_test/notices_menu/test_notices_menu.robot
@@ -7,7 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Notices_Menu
+Test Tags      Notices_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_firmware_sub_menu.robot b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
index 051c758..1ed65b7 100644
--- a/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
@@ -7,7 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Firmware_Sub_Menu
+Test Tags      Firmware_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_host_console_sub_menu.robot b/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
index 2184136..4704c55 100644
--- a/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Host_Console_Sub_Menu
+Test Tags      Host_Console_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot b/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
index 041637f..879d22e 100644
--- a/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
@@ -9,7 +9,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Reboot_BMC_Sub_Menu
+Test Tags      Reboot_BMC_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
index 805ee88..062aba6 100644
--- a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
@@ -8,7 +8,7 @@
 Test Setup      Run Keywords  Launch Browser And Login GUI  AND  Navigate to Server Power Operation Page
 Test Teardown   Close Browser
 
-Force Tags      Server_Power_Operations_Sub_Menu
+Test Tags      Server_Power_Operations_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/overview_menu/test_overview_menu.robot b/gui/gui_test/overview_menu/test_overview_menu.robot
index ac608c2..42e2406 100644
--- a/gui/gui_test/overview_menu/test_overview_menu.robot
+++ b/gui/gui_test/overview_menu/test_overview_menu.robot
@@ -13,7 +13,7 @@
 Suite Teardown  Run Keywords  Close Browser  AND  Redfish.Logout
 Test Setup      Test Setup Execution
 
-Force Tags      Overview_Menu
+Test Tags      Overview_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
index 9ef4a32..0ac420b 100644
--- a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
@@ -9,7 +9,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Certificates_Sub_Menu
+Test Tags      Certificates_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
index ceb0e45..38ce20b 100644
--- a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      LDAP_Sub_Menu
+Test Tags      LDAP_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
index def4240..43dad8b 100644
--- a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
+++ b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
@@ -8,7 +8,7 @@
 Suite Setup     Suite Setup Execution
 Test Teardown   FFDC On Test Case Fail
 
-Force Tags      Multiple_Interfaces
+Test Tags      Multiple_Interfaces
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
index 109a70f..694b49f 100644
--- a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
@@ -10,7 +10,7 @@
 Suite Teardown   Close Browser
 Test Setup       Test Setup Execution
 
-Force Tags       Policies_Sub_Menu
+Test Tags       Policies_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
index 842813b..389b92f 100644
--- a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Sessions_Sub_Menu
+Test Tags      Sessions_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
index 674e487..41bc631 100644
--- a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Suite Teardown Execution
 Test Setup      Test Setup Execution
 
-Force Tags      User_Management_Sub_Menu
+Test Tags      User_Management_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot b/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
index a8e26f1..8a66bcc 100644
--- a/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Suite Teardown Execution
 Test Setup      Navigate To Date and Time Page
 
-Force Tags      Date_And_Time_Sub_Menu
+Test Tags      Date_And_Time_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot b/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
index 7788951..c2c0a75 100644
--- a/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
@@ -7,7 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Factory_Reset_Sub_Menu
+Test Tags      Factory_Reset_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_network_sub_menu.robot b/gui/gui_test/settings_menu/test_network_sub_menu.robot
index 8a83246..c569cf6 100644
--- a/gui/gui_test/settings_menu/test_network_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_network_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Network_Sub_Menu
+Test Tags      Network_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
index 56a9af2..89fd2a5 100644
--- a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown   Close Browser
 Test Setup       Test Setup Execution
 
-Force Tags       Power_Restore_Policy_Sub_Menu
+Test Tags       Power_Restore_Policy_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
index e42b04c..4887faa 100644
--- a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
@@ -10,7 +10,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Run Keywords  Redfish.Logout  AND  Close Browser
 
-Force Tags      SNMP_Alerts_Sub_Menu
+Test Tags      SNMP_Alerts_Sub_Menu
 
 *** Variables ***