diff --git a/redfish/update_service/test_bmc_image_switch.robot b/redfish/update_service/test_bmc_image_switch.robot
index 26ee0e5..9904334 100755
--- a/redfish/update_service/test_bmc_image_switch.robot
+++ b/redfish/update_service/test_bmc_image_switch.robot
@@ -110,14 +110,14 @@
 
 Match BMC Release And Redifsh Firmware Version
     [Documentation]  The /etc/os-release vs Redfish FirmwareVersion attribute value from
-    ...             /redfish/v1/Managers/bmc should match.
+    ...             /redfish/v1/Managers/${MANAGER_ID} should match.
 
     # Python module: get_bmc_release_info()
     ${bmc_release_info}=  utils.Get BMC Release Info
     ${bmc_release}=  Set Variable  ${bmc_release_info['version_id']}
     Rprint Vars  bmc_release
 
-    ${firmware_version}=  Redfish.Get Attribute  /redfish/v1/Managers/bmc  FirmwareVersion
+    ${firmware_version}=  Redfish.Get Attribute  /redfish/v1/Managers/${MANAGER_ID}  FirmwareVersion
     Rprint Vars  firmware_version
 
     Should Be Equal As Strings   ${bmc_release}   ${firmware_version}
@@ -139,6 +139,6 @@
     Print Timen  Switch to back up completed.
 
     # Check if the BMC version after rebooted is the same version asked to switch.
-    ${firmware_version}=  Redfish.Get Attribute  /redfish/v1/Managers/bmc  FirmwareVersion
+    ${firmware_version}=  Redfish.Get Attribute  /redfish/v1/Managers/${MANAGER_ID}  FirmwareVersion
     Should Be Equal As Strings   ${image_version}   ${firmware_version}
     ...  msg=${image_version} does not match redfish version ${firmware_version}
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index 7ee8835..b9b59c7 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -85,7 +85,7 @@
     [Documentation]  Verify BMC version from FirmwareInventory same as in manager.
     [Tags]  Verify_BMC_Version_Matches_With_FirmwareInventory
 
-    ${bmc_manager}=  Redfish.Get  /redfish/v1/Managers/bmc
+    ${bmc_manager}=  Redfish.Get  /redfish/v1/Managers/${MANAGER_ID}
     ${manager_bmc_version}=  Get BMC Version
     # Check for manager version and cat /etc/os-release.
     Should Be Equal As Strings
@@ -195,7 +195,7 @@
     # /redfish/v1/UpdateService/FirmwareInventory/632c5114
     # /redfish/v1/UpdateService/FirmwareInventory/e702a011
 
-    ${firmware_inv_path}=  Redfish.Get Properties  ${REDFISH_BASE_URI}Managers/bmc
+    ${firmware_inv_path}=  Redfish.Get Properties  ${REDFISH_BASE_URI}Managers/${MANAGER_ID}
     ${firmware_inv_path}=  Get From Dictionary  ${firmware_inv_path}  Links
     ${sw_image}=  Get From Dictionary  ${firmware_inv_path}  SoftwareImages
 
@@ -271,11 +271,11 @@
     ${sw_inv_list}=  Get Functional Firmware  BMC image
     ${sw_inv_dict}=  Get Non Functional Firmware  ${sw_inv_list}  True
 
-    # /redfish/v1/Managers/bmc
+    # /redfish/v1/Managers/${MANAGER_ID}
     # "FirmwareVersion": "2.8.0-dev-150-g04508dc9f"
 
     ${firmware_version}=  Redfish.Get Attribute
-    ...  ${REDFISH_BASE_URI}Managers/bmc  FirmwareVersion
+    ...  ${REDFISH_BASE_URI}Managers/${MANAGER_ID}  FirmwareVersion
 
     Should Be Equal  ${sw_inv_dict['version']}  ${firmware_version}
 
@@ -297,11 +297,11 @@
     ${sw_inv_list}=  Get Functional Firmware  BMC image
     ${sw_inv_list}=  Get Non Functional Firmware List  ${sw_inv_list}  False
 
-    # /redfish/v1/Managers/bmc
+    # /redfish/v1/Managers/${MANAGER_ID}
     # "FirmwareVersion": "2.8.0-dev-150-g04508dc9f"
 
     ${firmware_version}=  Redfish.Get Attribute
-    ...  ${REDFISH_BASE_URI}Managers/bmc  FirmwareVersion
+    ...  ${REDFISH_BASE_URI}Managers/${MANAGER_ID}  FirmwareVersion
 
     FOR  ${sw_inv}  IN  @{sw_inv_list}
       Should Not Be Equal  ${sw_inv['version']}  ${firmware_version}
@@ -348,7 +348,7 @@
     # /redfish/v1/UpdateService/FirmwareInventory/632c5114
     # /redfish/v1/UpdateService/FirmwareInventory/632c5444
 
-    ${firmware_inv_path}=  Redfish.Get Properties  ${REDFISH_BASE_URI}Managers/bmc
+    ${firmware_inv_path}=  Redfish.Get Properties  ${REDFISH_BASE_URI}Managers/${MANAGER_ID}
     ${firmware_inv_path}=  Get From Dictionary  ${firmware_inv_path}  Links
     ${active_sw_image}=  Get From Dictionary  ${firmware_inv_path}  ActiveSoftwareImage
     ${active_sw_image}=  Get From Dictionary  ${active_sw_image}  @odata.id
diff --git a/redfish/update_service/test_redfish_bmc_code_update.robot b/redfish/update_service/test_redfish_bmc_code_update.robot
index c551135..ccfde94 100644
--- a/redfish/update_service/test_redfish_bmc_code_update.robot
+++ b/redfish/update_service/test_redfish_bmc_code_update.robot
@@ -338,7 +338,7 @@
 Get Active Firmware Image
     [Documentation]  Return get active firmware image.
 
-    ${active_image}=  Redfish.Get Attribute  /redfish/v1/Managers/bmc  Links
+    ${active_image}=  Redfish.Get Attribute  /redfish/v1/Managers/${MANAGER_ID}  Links
     Rprint Vars  active_image
 
     [Return]  ${active_image}