diff --git a/ipmi/dcmi/test_dcmi_asset_tag.robot b/ipmi/dcmi/test_dcmi_asset_tag.robot
index 02462fd..3456afd 100644
--- a/ipmi/dcmi/test_dcmi_asset_tag.robot
+++ b/ipmi/dcmi/test_dcmi_asset_tag.robot
@@ -11,6 +11,7 @@
 Suite Teardown   Redfish.Logout
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       DCMI_Asset_Tag
 
 *** Test Cases ***
 
diff --git a/ipmi/dcmi/test_dcmi_get_capabilities.robot b/ipmi/dcmi/test_dcmi_get_capabilities.robot
index 25d7a89..b7df1f3 100644
--- a/ipmi/dcmi/test_dcmi_get_capabilities.robot
+++ b/ipmi/dcmi/test_dcmi_get_capabilities.robot
@@ -3,7 +3,10 @@
 Documentation    Module to test dcmi get capabilites functionality.
 Resource         ../../lib/ipmi_client.robot
 
+Force Tags       DCMI_Get_Capabilities
+
 *** Variables ***
+
 @{slave_address_list}  Slave address of device: 0h (8bits)(Satellite/External controller)
 ...                    Slave address of device: 20h (BMC)
 
@@ -43,4 +46,4 @@
       Exit For Loop IF  ${slave_address_status} == True
     END
 
-    Run Keyword IF  ${slave_address_status} == False  Fail  msg=Slave address is showing wrongly.
\ No newline at end of file
+    Run Keyword IF  ${slave_address_status} == False  Fail  msg=Slave address is showing wrongly.
diff --git a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
index a27d188..5e3357e 100644
--- a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
+++ b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
@@ -15,7 +15,10 @@
 
 Suite Setup  Suite Setup Execution
 
+Force Tags       DCMI_Get_Temperature_Reading
+
 *** Variables ***
+
 ${config_file_name}             dcmi_sensors.json
 ${dcmi_sensors_info_json_file}  /usr/share/ipmi-providers/${config_file_name}
 ${client_config_file_path}      ${EXEC_DIR}/${config_file_name}
diff --git a/ipmi/dcmi/test_dcmi_management_controller.robot b/ipmi/dcmi/test_dcmi_management_controller.robot
index a0810fd..e32c79c 100644
--- a/ipmi/dcmi/test_dcmi_management_controller.robot
+++ b/ipmi/dcmi/test_dcmi_management_controller.robot
@@ -13,7 +13,10 @@
 Library          ../../lib/utils.py
 Library          JSONLibrary
 
+Force Tags       DCMI_Management_Controller
+
 *** Variables ***
+
 ${hostname_file_path}  /etc/hostname
 
 *** Test Cases ***
diff --git a/ipmi/test_get_bios_post_code.robot b/ipmi/test_get_bios_post_code.robot
index be93139..169f2c7 100644
--- a/ipmi/test_get_bios_post_code.robot
+++ b/ipmi/test_get_bios_post_code.robot
@@ -6,10 +6,13 @@
 Library          ../lib/ipmi_utils.py
 Variables        ../data/ipmi_raw_cmd_table.py
 
-Suite Setup  IPMI Power On
-Suite Teardown  IPMI Power On  stack_mode=skip  quiet=1
+Suite Setup      IPMI Power On
+Suite Teardown   IPMI Power On  stack_mode=skip  quiet=1
+
+Force Tags       Get_BIOS_Post_Code
 
 *** Test Cases ***
+
 Test Get BIOS POST Code via IPMI Raw Command
     [Documentation]  Get BIOS POST Code via IPMI raw command.
     [Tags]  Test_Get_BIOS_POST_Code_via_IPMI_Raw_Command
diff --git a/ipmi/test_ipmi_chassis.robot b/ipmi/test_ipmi_chassis.robot
index 1c9f030..ddf4ce4 100644
--- a/ipmi/test_ipmi_chassis.robot
+++ b/ipmi/test_ipmi_chassis.robot
@@ -12,6 +12,7 @@
 Suite Teardown   Redfish.Logout
 Test Teardown    Test Teardown Execution
 
+Force Tags       IPMI_Chassis
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_cipher.robot b/ipmi/test_ipmi_cipher.robot
index 0c869df..21e2b61 100644
--- a/ipmi/test_ipmi_cipher.robot
+++ b/ipmi/test_ipmi_cipher.robot
@@ -13,6 +13,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_Cipher
 
 *** Variables  ***
 ${cipher_suite}      standard
diff --git a/ipmi/test_ipmi_cold_reset.robot b/ipmi/test_ipmi_cold_reset.robot
index e13a000..1a4b5d9 100644
--- a/ipmi/test_ipmi_cold_reset.robot
+++ b/ipmi/test_ipmi_cold_reset.robot
@@ -29,6 +29,7 @@
 
 Test Teardown       FFDC On Test Case Fail
 
+Force Tags          IPMI_Cold_Reset
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_device_id.robot b/ipmi/test_ipmi_device_id.robot
index 3769842..ea0f3be 100644
--- a/ipmi/test_ipmi_device_id.robot
+++ b/ipmi/test_ipmi_device_id.robot
@@ -21,6 +21,7 @@
 Library             ../lib/var_funcs.py
 Variables           ../data/ipmi_raw_cmd_table.py
 
+Force Tags          IPMI_Device_ID
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_disable.robot b/ipmi/test_ipmi_disable.robot
index e0f382a..c97573e 100644
--- a/ipmi/test_ipmi_disable.robot
+++ b/ipmi/test_ipmi_disable.robot
@@ -5,6 +5,8 @@
 Resource         ../lib/openbmc_ffdc.robot
 Library          ../lib/ipmi_utils.py
 
+Force Tags       IPMI_Disable
+
 *** Test Cases ***
 
 Verify Disabling And Enabling IPMI Via Host
diff --git a/ipmi/test_ipmi_fru.robot b/ipmi/test_ipmi_fru.robot
index c088a66..24f1c26 100644
--- a/ipmi/test_ipmi_fru.robot
+++ b/ipmi/test_ipmi_fru.robot
@@ -10,8 +10,10 @@
 Suite Teardown         Suite Teardown Execution
 Test Teardown          Test Teardown Execution
 
+Force Tags             IPMI_FRU
 
 *** Variables ***
+
 &{ipmi_redfish_fru_field_map}  product_serial=SerialNumber  product_part_number=PartNumber
 
 *** Test Cases ***
diff --git a/ipmi/test_ipmi_fru_device.robot b/ipmi/test_ipmi_fru_device.robot
index 5ed37b7..dee7595 100644
--- a/ipmi/test_ipmi_fru_device.robot
+++ b/ipmi/test_ipmi_fru_device.robot
@@ -6,7 +6,10 @@
 Variables              ../data/ipmi_raw_cmd_table.py
 Library                ../lib/ipmi_utils.py
 
+Force Tags             IPMI_FRU_Device
+
 *** Variables ***
+
 ${FRU_NAME}       dimm01 dimm02 cpu0 cpu1  motherboard
 ${BUSCTL_FRU}                xyz.openbmc_project.FruDevice
 ${FRU_DBUS_URL}              /xyz/openbmc_project/FruDevice
@@ -390,4 +393,4 @@
     Write FRU Data Via IPMI  ${fru_device_id}  ${read_write_offset}  ${fru_byte}  ${initial_frulength_hex}
     # Verify whether initial FRU data is restored.
     ${fru_data}=  Read FRU Data Via IPMI  ${fru_device_id}  ${read_write_offset}
-    Should Be Equal  ${fru_data}  ${initial_fru_data}
\ No newline at end of file
+    Should Be Equal  ${fru_data}  ${initial_fru_data}
diff --git a/ipmi/test_ipmi_general.robot b/ipmi/test_ipmi_general.robot
index b53005a..eb665a4 100644
--- a/ipmi/test_ipmi_general.robot
+++ b/ipmi/test_ipmi_general.robot
@@ -12,6 +12,8 @@
 Suite Setup      IPMI General Test Suite Setup
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_General
+
 *** Test Cases ***
 
 Test Get Self Test Results via IPMI Raw Command
diff --git a/ipmi/test_ipmi_inband_sdr.robot b/ipmi/test_ipmi_inband_sdr.robot
index 2e438a0..3462e22 100644
--- a/ipmi/test_ipmi_inband_sdr.robot
+++ b/ipmi/test_ipmi_inband_sdr.robot
@@ -16,8 +16,7 @@
 Suite Teardown         Redfish.Logout
 Test Teardown          FFDC On Test Case Fail
 
-Force Tags             Ipmi_Inband_Sdr
-
+Force Tags             IPMI_Inband_SDR
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_kcs.robot b/ipmi/test_ipmi_kcs.robot
index bfb7169..0cc2ecc 100644
--- a/ipmi/test_ipmi_kcs.robot
+++ b/ipmi/test_ipmi_kcs.robot
@@ -1,17 +1,18 @@
 *** Settings ***
 
-Documentation          To Verify KCS interface.
+Documentation   To Verify KCS interface.
 
-Resource               ../lib/ipmi_client.robot
-Resource               ../lib/ipmi_utils.robot
-Variables              ../data/ipmi_raw_cmd_table.py
-Library                ../lib/ipmi_utils.py
-
+Resource        ../lib/ipmi_client.robot
+Resource        ../lib/ipmi_utils.robot
+Variables       ../data/ipmi_raw_cmd_table.py
+Library         ../lib/ipmi_utils.py
 
 Suite Setup     Suite Setup Execution
 
+Force Tags      IPMI_KCS
 
 *** Variables ***
+
 ${LOOP_COUNT}          ${1}
 
 
diff --git a/ipmi/test_ipmi_lanplus.robot b/ipmi/test_ipmi_lanplus.robot
index 24aac0b..afd82e6 100644
--- a/ipmi/test_ipmi_lanplus.robot
+++ b/ipmi/test_ipmi_lanplus.robot
@@ -7,7 +7,10 @@
 Variables              ../data/ipmi_raw_cmd_table.py
 Library                ../lib/ipmi_utils.py
 
+Force Tags             IPMI_LANplus
+
 *** Variables ***
+
 ${LOOP_COUNT}          ${1}
 
 
diff --git a/ipmi/test_ipmi_mc_id.robot b/ipmi/test_ipmi_mc_id.robot
index 2133b25..4972a04 100644
--- a/ipmi/test_ipmi_mc_id.robot
+++ b/ipmi/test_ipmi_mc_id.robot
@@ -7,6 +7,7 @@
 
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_MC_ID
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_network_configuration.robot b/ipmi/test_ipmi_network_configuration.robot
index f645b46..6066103 100644
--- a/ipmi/test_ipmi_network_configuration.robot
+++ b/ipmi/test_ipmi_network_configuration.robot
@@ -15,10 +15,10 @@
 Test Setup             Printn
 Test Teardown          Test Teardown Execution
 
-Force Tags             Ipmi_Network_Configuration
-
+Force Tags             IPMI_Network_Configuration
 
 *** Variables ***
+
 ${vlan_id_for_ipmi}     ${10}
 @{vlan_ids}             ${20}  ${30}
 ${interface}            eth0
diff --git a/ipmi/test_ipmi_network_verification.robot b/ipmi/test_ipmi_network_verification.robot
index 11d99d5..bc06034 100644
--- a/ipmi/test_ipmi_network_verification.robot
+++ b/ipmi/test_ipmi_network_verification.robot
@@ -14,10 +14,10 @@
 Test Setup             Printn
 Test Teardown          FFDC On Test Case Fail
 
-Force Tags             Ipmi_Network_Verification
-
+Force Tags             IPMI_Network_Verification
 
 *** Variables ***
+
 ${set_mac_address}                      02:f4:43:24:e7:1a
 ${Invalid_mac_address}                  11:f4:43:24:e7:1a
 
diff --git a/ipmi/test_ipmi_payload.robot b/ipmi/test_ipmi_payload.robot
index b4ff0c7..dcab815 100644
--- a/ipmi/test_ipmi_payload.robot
+++ b/ipmi/test_ipmi_payload.robot
@@ -7,12 +7,13 @@
 Variables           ../data/ipmi_raw_cmd_table.py
 Library             ../lib/ipmi_utils.py
 
-
 Suite Setup         IPMI Payload Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
+Force Tags          IPMI_Payload
 
 *** Variables ***
+
 ${user_priv}                     2
 ${operator_priv}                 3
 ${admin_level_priv}              4
diff --git a/ipmi/test_ipmi_poh_counter.robot b/ipmi/test_ipmi_poh_counter.robot
index b664a85..ae17bf9 100644
--- a/ipmi/test_ipmi_poh_counter.robot
+++ b/ipmi/test_ipmi_poh_counter.robot
@@ -31,11 +31,12 @@
 Library             ../lib/ipmi_utils.py
 Variables           ../data/ipmi_raw_cmd_table.py
 
-Suite Setup      Suite Setup Execution
-Suite Teardown   Suite Teardown Execution
+Suite Setup         Suite Setup Execution
+Suite Teardown      Suite Teardown Execution
 
-Test Teardown    FFDC On Test Case Fail
+Test Teardown       FFDC On Test Case Fail
 
+Force Tags          IPMI_Poh_Counter
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_resets.robot b/ipmi/test_ipmi_resets.robot
index 38fc96c..1d2a2d5 100755
--- a/ipmi/test_ipmi_resets.robot
+++ b/ipmi/test_ipmi_resets.robot
@@ -9,6 +9,8 @@
 
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_Resets
+
 *** Variables ***
 
 # User may pass LOOP_COUNT.
diff --git a/ipmi/test_ipmi_sdr.robot b/ipmi/test_ipmi_sdr.robot
index b176368..4577dda 100755
--- a/ipmi/test_ipmi_sdr.robot
+++ b/ipmi/test_ipmi_sdr.robot
@@ -14,8 +14,7 @@
 Suite Teardown          Redfish.Logout
 Test Teardown           Test Teardown Execution
 
-Force Tags              Ipmi_Sdr
-
+Force Tags              IPMI_SDR
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_sel.robot b/ipmi/test_ipmi_sel.robot
index 189660d..8b201ea 100644
--- a/ipmi/test_ipmi_sel.robot
+++ b/ipmi/test_ipmi_sel.robot
@@ -9,6 +9,8 @@
 Test Setup       Test Setup Execution
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_SEL
+
 *** Variables ***
 
 # Based on 13th byte of add SEL entry command as per IPMI spec
diff --git a/ipmi/test_ipmi_sel_time.robot b/ipmi/test_ipmi_sel_time.robot
index 089ee70..d60dcdd 100644
--- a/ipmi/test_ipmi_sel_time.robot
+++ b/ipmi/test_ipmi_sel_time.robot
@@ -37,6 +37,8 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
+Force Tags       IPMI_SEL_Time
+
 *** Variables ***
 
 ${NETWORK_RESTART_TIME}   5s
diff --git a/ipmi/test_ipmi_sensor.robot b/ipmi/test_ipmi_sensor.robot
index a4254c2..6a312c5 100644
--- a/ipmi/test_ipmi_sensor.robot
+++ b/ipmi/test_ipmi_sensor.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Documentation  Validate IPMI sensor IDs using Redfish.
+Documentation     Validate IPMI sensor IDs using Redfish.
 
 Resource          ../lib/ipmi_client.robot
 Resource          ../lib/openbmc_ffdc.robot
@@ -11,8 +11,10 @@
 Test Teardown     Run Keywords  FFDC On Test Case Fail  AND
 ...  Redfish.Logout
 
+Force Tags        IPMI_Sensor
 
 *** Variables ***
+
 ${allowed_temp_diff}    ${2}
 ${allowed_power_diff}   ${10}
 
diff --git a/ipmi/test_ipmi_sol.robot b/ipmi/test_ipmi_sol.robot
index f13a212..5bf83bc 100644
--- a/ipmi/test_ipmi_sol.robot
+++ b/ipmi/test_ipmi_sol.robot
@@ -12,8 +12,7 @@
 Test Setup          Start SOL Console Logging
 Test Teardown       Test Teardown Execution
 
-Force Tags          Ipmi_Sol
-
+Force Tags          IPMI_SOL
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_systeminfo_parameters.robot b/ipmi/test_ipmi_systeminfo_parameters.robot
index 9c3aef0..94a3673 100644
--- a/ipmi/test_ipmi_systeminfo_parameters.robot
+++ b/ipmi/test_ipmi_systeminfo_parameters.robot
@@ -19,6 +19,7 @@
 Suite Setup         Suite Setup Execution
 Test Teardown       Run Keywords  Restore Default Configuration  AND  FFDC On Test Case Fail
 
+Force Tags          IPMI_SystemInfo_Parameters
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index 9b020c8..be63b6e 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -10,6 +10,8 @@
 Suite Setup         Suite Setup Execution
 Test Teardown       Test Teardown Execution
 
+Force Tags          IPMI_User
+
 *** Variables ***
 
 ${invalid_username}     user%
diff --git a/ipmi/test_ipmi_watchdog.robot b/ipmi/test_ipmi_watchdog.robot
index bb776ba..37e353f 100644
--- a/ipmi/test_ipmi_watchdog.robot
+++ b/ipmi/test_ipmi_watchdog.robot
@@ -9,6 +9,8 @@
 Library          Collections
 Variables        ../data/ipmi_raw_cmd_table.py
 
+Force Tags       IPMI_Watchdog
+
 *** Variables ***
 
 ${TIMER_DELAY}          3
diff --git a/network/network_diagnostic_report.robot b/network/network_diagnostic_report.robot
index 9e02a96..b081fd5 100644
--- a/network/network_diagnostic_report.robot
+++ b/network/network_diagnostic_report.robot
@@ -7,7 +7,7 @@
 Resource      ../lib/utils.robot
 Test Setup    Check If Tool Exist
 
-Force Tags  Network_Diagnostic_Report
+Force Tags    Network_Diagnostic_Report
 
 *** Test Cases ***
 
diff --git a/network/test_bmc_dhcp_conf.robot b/network/test_bmc_dhcp_conf.robot
index b99eca0..d44dbb8 100644
--- a/network/test_bmc_dhcp_conf.robot
+++ b/network/test_bmc_dhcp_conf.robot
@@ -8,6 +8,8 @@
 Suite Setup            Suite Setup Execution
 Suite Teardown         Run Keywords  Restore Configuration  AND Redfish.Logout
 
+Force Tags             BMC_DHCP_Conf
+
 *** Variables ***
 
 &{dhcp_enable_dict}                DHCPEnabled=${True}
diff --git a/network/test_cable_pull_recover.robot b/network/test_cable_pull_recover.robot
index 776b981..82dee74 100644
--- a/network/test_cable_pull_recover.robot
+++ b/network/test_cable_pull_recover.robot
@@ -21,6 +21,8 @@
 
 Suite Setup     Test Setup Execution
 
+Force Tags      Cable_Pull_Recover
+
 *** Variables ***
 
 ${PORT_NUMBER}  ${EMPTY}
diff --git a/network/test_host_network_interfaces.robot b/network/test_host_network_interfaces.robot
index bf4a126..3a7b704 100644
--- a/network/test_host_network_interfaces.robot
+++ b/network/test_host_network_interfaces.robot
@@ -12,7 +12,10 @@
 
 Resource         ../syslib/utils_install.robot
 
+Force Tags       Host_Network_Interfaces
+
 *** Variables ***
+
 ${FAIL_ON_LINK_DOWN}  1
 
 
diff --git a/network/test_vlan_network.robot b/network/test_vlan_network.robot
index 9f683c1..57972c3 100644
--- a/network/test_vlan_network.robot
+++ b/network/test_vlan_network.robot
@@ -18,8 +18,10 @@
 
 Suite Teardown                  Suite Teardown Execution
 
+Force Tags                      VLAN_Network
 
 *** Variables ***
+
 ${vlan_id}                      ${53}
 @{vlan_ids}                     ${35}  ${55}
 ${invalid_vlan_id}              abc
diff --git a/oem/nuvoton/test_ipmi_flash.robot b/oem/nuvoton/test_ipmi_flash.robot
index 98a1211..a69405d 100644
--- a/oem/nuvoton/test_ipmi_flash.robot
+++ b/oem/nuvoton/test_ipmi_flash.robot
@@ -8,7 +8,10 @@
 
 Suite Setup      Suite Setup Execution
 
+Force Tags       IPMI_Flash
+
 *** Variables ***
+
 ${image-bios}        image-bios
 ${image-bios-sig}    image-bios.sig
 ${image-bmc}         image-bmc
diff --git a/oem/nuvoton/test_jtag_master.robot b/oem/nuvoton/test_jtag_master.robot
index b181d95..0af1054 100644
--- a/oem/nuvoton/test_jtag_master.robot
+++ b/oem/nuvoton/test_jtag_master.robot
@@ -4,6 +4,8 @@
 Resource         ../../lib/openbmc_ffdc.robot
 Resource         ../../lib/connection_client.robot
 
+Force Tags       JTAG_Master
+
 Suite Setup      Suite Setup Execution
 
 *** Variables ***
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
diff --git a/snmp/test_bmc_snmp_config.robot b/snmp/test_bmc_snmp_config.robot
index a6ba5c5..1329b03 100644
--- a/snmp/test_bmc_snmp_config.robot
+++ b/snmp/test_bmc_snmp_config.robot
@@ -13,6 +13,8 @@
 
 Test Teardown  FFDC On Test Case Fail
 
+Force Tags     BMC_SNMP_Config
+
 *** Variables ***
 
 ${CMD_INTERNAL_FAILURE}  busctl call xyz.openbmc_project.Logging /xyz/openbmc_project/logging
diff --git a/systest/gpu_stress_test.robot b/systest/gpu_stress_test.robot
index 17e11c4..c8f52df 100755
--- a/systest/gpu_stress_test.robot
+++ b/systest/gpu_stress_test.robot
@@ -24,6 +24,8 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
+Force Tags       GPU_Stress
+
 *** Variables ****
 
 ${HTX_DURATION}      1h
diff --git a/systest/htx_hardbootme_test.robot b/systest/htx_hardbootme_test.robot
index 789a713..845b5b3 100755
--- a/systest/htx_hardbootme_test.robot
+++ b/systest/htx_hardbootme_test.robot
@@ -51,6 +51,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
+Force Tags      HTX_Hardbootme
 
 *** Variables ****
 
diff --git a/systest/htx_softbootme_test.robot b/systest/htx_softbootme_test.robot
index 7a54465..42153b2 100644
--- a/systest/htx_softbootme_test.robot
+++ b/systest/htx_softbootme_test.robot
@@ -22,6 +22,8 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
+Force Tags      HTX_Softbootme
+
 *** Variables ****
 
 ${rest_keyword}     REST
diff --git a/systest/network_stability_test.robot b/systest/network_stability_test.robot
index bf1dfdd..f1e6b6c 100755
--- a/systest/network_stability_test.robot
+++ b/systest/network_stability_test.robot
@@ -8,6 +8,8 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
+Force Tags      Network_Stability
+
 *** Variables ****
 
 ${stack_mode}        skip
diff --git a/systest/proc_freq_check.robot b/systest/proc_freq_check.robot
index d37e9f8..1e8a80f 100755
--- a/systest/proc_freq_check.robot
+++ b/systest/proc_freq_check.robot
@@ -14,6 +14,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
+Force Tags       Proc_Freq_Check
 
 *** Test Cases ***
 
diff --git a/systest/test_bmc_poll_errors.robot b/systest/test_bmc_poll_errors.robot
index d028408..edf26af 100755
--- a/systest/test_bmc_poll_errors.robot
+++ b/systest/test_bmc_poll_errors.robot
@@ -9,8 +9,10 @@
 Resource          ../lib/bmc_redfish_resource.robot
 Resource          ../lib/esel_utils.robot
 
-Suite Setup      Suite Setup Execution
-Test Teardown    Post Test Case Execution
+Suite Setup       Suite Setup Execution
+Test Teardown     Post Test Case Execution
+
+Force Tags        BMC_Poll_Errors
 
 *** Variables ***
 
diff --git a/systest/test_boot_acceptance.robot b/systest/test_boot_acceptance.robot
index a56e74e..544bca1 100644
--- a/systest/test_boot_acceptance.robot
+++ b/systest/test_boot_acceptance.robot
@@ -49,6 +49,8 @@
 Suite Teardown  Collect HTX Log Files
 Test Teardown   FFDC On Test Case Fail
 
+Force Tags      Boot_Acceptance
+
 *** Variables ***
 
 ${HTX_DURATION}     8 hours