diff --git a/redfish/update_service/test_bmc_image_switch.robot b/redfish/update_service/test_bmc_image_switch.robot
index 9904334..77e839e 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    Test_BMC_Image_Switch
+Force Tags               Bmc_Image_Switch
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_firmware_tftp_upload_image.robot b/redfish/update_service/test_firmware_tftp_upload_image.robot
index 7680d83..3caeeb3 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       tftp_update
+Force 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 8f177e3..b02441e 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               BMC_Code_Update
+Force 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 e4d78c8..db00ad9 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               Host_Code_Update
+Force 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 75ba8a0..ebb6936 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  Upload_Test
+Force 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 1c3779a..72d6518 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   Signed_Upload_Test
+Force Tags               Redfish_Signed_Image_Update
 
 *** Variables ***