diff --git a/extended/factory_reset.robot b/extended/factory_reset.robot
index 7d7fdd2..c572a1c 100644
--- a/extended/factory_reset.robot
+++ b/extended/factory_reset.robot
@@ -10,6 +10,8 @@
 Suite Setup      Validate Setup
 Suite Teardown   Close All Connections
 
+Force Tags  Factory_Reset
+
 *** Test Cases ***
 
 Verify Factory Reset
diff --git a/extended/full_suite_regression.robot b/extended/full_suite_regression.robot
index b3105ad..4cd031c 100755
--- a/extended/full_suite_regression.robot
+++ b/extended/full_suite_regression.robot
@@ -11,6 +11,8 @@
 Suite Setup         Open Connection And Log In
 Suite Teardown      Close All Connections
 
+Force Tags  Full_Suite_Regression
+
 *** Variables ***
 ${ITERATION}          10
 ${RESULT_DIR_NAME}    logsdir
diff --git a/extended/network_diagnostic_report.robot b/extended/network_diagnostic_report.robot
index 0c8014a..dc89a36 100644
--- a/extended/network_diagnostic_report.robot
+++ b/extended/network_diagnostic_report.robot
@@ -7,6 +7,8 @@
 Resource      ../lib/utils.robot
 Test Setup    Check If Tool Exist
 
+Force Tags  Check_Network_Latency
+
 *** Test Cases ***
 
 Check Network Latency
diff --git a/extended/obmc_boot_test.robot b/extended/obmc_boot_test.robot
index d0b8696..a33a3c8 100644
--- a/extended/obmc_boot_test.robot
+++ b/extended/obmc_boot_test.robot
@@ -4,6 +4,7 @@
 Resource  obmc_boot_test_resource.robot
 
 *** Variables ***
+
 *** Test Cases ***
 General Boot Testing
     [Documentation]  Performs repeated boot tests.
diff --git a/extended/run_keyword.robot b/extended/run_keyword.robot
index cf45d29..f5b1671 100644
--- a/extended/run_keyword.robot
+++ b/extended/run_keyword.robot
@@ -29,6 +29,7 @@
 # NOTE: Robot searches PYTHONPATH for libraries.
 Library   run_keyword.py
 
+Force Tags  Run_Keyword_Pgm
 
 *** Variables ***
 # Initialize program parameters variables.
diff --git a/extended/test_ac_cycles.robot b/extended/test_ac_cycles.robot
index d2fa50c..9ff1295 100644
--- a/extended/test_ac_cycles.robot
+++ b/extended/test_ac_cycles.robot
@@ -11,6 +11,8 @@
 Suite Teardown    Close All Connections
 Test Teardown     FFDC On Test Case Fail
 
+Force Tags  AC_Cycles
+
 *** Test Cases ***
 
 Test OpenBMC Buster
diff --git a/extended/test_bios_update.robot b/extended/test_bios_update.robot
index ecb9751..3d3e042 100644
--- a/extended/test_bios_update.robot
+++ b/extended/test_bios_update.robot
@@ -12,6 +12,8 @@
 
 Test Teardown           Test Bios Teardown
 
+Force Tags  PNOR_BIOS_Code_Update
+
 *** Variables ***
 
 ${QUIET}                ${1}
diff --git a/extended/test_host_network.robot b/extended/test_host_network.robot
index e817619..73adfd6 100644
--- a/extended/test_host_network.robot
+++ b/extended/test_host_network.robot
@@ -14,6 +14,8 @@
 
 Test Teardown       Post Test Execution
 
+Force Tags  Host_Network
+
 *** Variables ***
 ${SET_ADDR_PREFIX}  0x00 0x08 0x61 0x80 0x21 0x70 0x62 0x21 0x00 0x01 0x06 0x04
 ${STATIC}           0x00 0x01                       #equivalent address type 1
diff --git a/extended/test_slp.robot b/extended/test_slp.robot
index d6ccd3d..deee965 100644
--- a/extended/test_slp.robot
+++ b/extended/test_slp.robot
@@ -9,6 +9,8 @@
 # Get the SLP services available, make it suite global.
 Suite Setup     Get Service Types Output
 
+Force Tags  SLP_Service_Test
+
 *** Variables ***
 ${service_types}    findsrvtypes
 ${service_agents}   findsrvs
diff --git a/extended/test_uploadimage.robot b/extended/test_uploadimage.robot
index 19dc35a..46a4829 100644
--- a/extended/test_uploadimage.robot
+++ b/extended/test_uploadimage.robot
@@ -16,6 +16,8 @@
 
 Test Teardown  Upload Image Teardown
 
+Force Tags  Upload_Test
+
 *** Variables ***
 ${timeout}            10
 ${UPLOAD_DIR_PATH}    /tmp/images/