diff --git a/redfish/update_service/test_bmc_image_switch.robot b/redfish/update_service/test_bmc_image_switch.robot
index 77e839e..787d645 100755
--- a/redfish/update_service/test_bmc_image_switch.robot
+++ b/redfish/update_service/test_bmc_image_switch.robot
@@ -11,7 +11,7 @@
 Suite Teardown           Run Keyword And Ignore Error  Redfish.Logout
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Bmc_Image_Switch
+Test Tags               Bmc_Image_Switch
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index b50c319..e1d3632 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -10,7 +10,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags     Firmware_Inventory
+Test Tags     Firmware_Inventory
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_firmware_property.robot b/redfish/update_service/test_firmware_property.robot
index 6c32451..cd14b53 100755
--- a/redfish/update_service/test_firmware_property.robot
+++ b/redfish/update_service/test_firmware_property.robot
@@ -11,7 +11,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags    Firmware_Property
+Test Tags    Firmware_Property
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_firmware_tftp_upload_image.robot b/redfish/update_service/test_firmware_tftp_upload_image.robot
index 77db19d..f44e66b 100644
--- a/redfish/update_service/test_firmware_tftp_upload_image.robot
+++ b/redfish/update_service/test_firmware_tftp_upload_image.robot
@@ -26,7 +26,7 @@
 Test Setup       Run Keywords  Redfish Power Off  stack_mode=skip  quiet=1  AND  Redfish.Login
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Firmware_Tftp_Upload_Image
+Test Tags       Firmware_Tftp_Upload_Image
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_redfish_bmc_code_update.robot b/redfish/update_service/test_redfish_bmc_code_update.robot
index 162a6c0..6f754c2 100644
--- a/redfish/update_service/test_redfish_bmc_code_update.robot
+++ b/redfish/update_service/test_redfish_bmc_code_update.robot
@@ -31,7 +31,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Redfish_Bmc_Code_Update
+Test Tags               Redfish_Bmc_Code_Update
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_redfish_host_code_update.robot b/redfish/update_service/test_redfish_host_code_update.robot
index c9fc7e3..6a1052c 100644
--- a/redfish/update_service/test_redfish_host_code_update.robot
+++ b/redfish/update_service/test_redfish_host_code_update.robot
@@ -27,7 +27,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Redfish_Host_Code_Update
+Test Tags               Redfish_Host_Code_Update
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_redfish_image_upload.robot b/redfish/update_service/test_redfish_image_upload.robot
index 19b4436..c0d2257 100644
--- a/redfish/update_service/test_redfish_image_upload.robot
+++ b/redfish/update_service/test_redfish_image_upload.robot
@@ -33,7 +33,7 @@
 Test Setup             Printn
 Test Teardown          Test Teardown Execution
 
-Force Tags             Redfish_Image_Upload
+Test Tags             Redfish_Image_Upload
 
 *** Variables ***
 ${timeout}             20
diff --git a/redfish/update_service/test_redfish_signed_image_update.robot b/redfish/update_service/test_redfish_signed_image_update.robot
index 72d6518..d93aa33 100755
--- a/redfish/update_service/test_redfish_signed_image_update.robot
+++ b/redfish/update_service/test_redfish_signed_image_update.robot
@@ -25,7 +25,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Redfish_Signed_Image_Update
+Test Tags               Redfish_Signed_Image_Update
 
 *** Variables ***