diff --git a/ipmi/test_ipmi_general.robot b/ipmi/test_ipmi_general.robot
index 924147a..8995df9 100644
--- a/ipmi/test_ipmi_general.robot
+++ b/ipmi/test_ipmi_general.robot
@@ -30,7 +30,7 @@
     [Tags]  Test_Get_Device_GUID_Via_IPMI_Raw_Command
     [Teardown]  Run Keywords  Redfish.Logout  AND  FFDC On Test Case Fail
     # Get GUIDS via IPMI.
-    # This should match the /redfish/v1/Managers/bmc's UUID data.
+    # This should match the /redfish/v1/Managers/${MANAGER_ID}'s UUID data.
     ${guids}=  Run IPMI Standard Command  raw ${IPMI_RAW_CMD['Device GUID']['Get'][0]}
     # Reverse the order and remove space delims.
     ${guids}=  Split String  ${guids}
@@ -38,7 +38,7 @@
     ${guids}=  Evaluate  "".join(${guids})
 
     Redfish.Login
-    ${uuid}=  Redfish.Get Attribute  /redfish/v1/Managers/bmc  UUID
+    ${uuid}=  Redfish.Get Attribute  /redfish/v1/Managers/${MANAGER_ID}  UUID
     ${uuid}=  Remove String  ${uuid}  -
 
     Rprint Vars  guids  uuid
diff --git a/ipmi/test_ipmi_network_verification.robot b/ipmi/test_ipmi_network_verification.robot
index b1d4075..35a0df6 100644
--- a/ipmi/test_ipmi_network_verification.robot
+++ b/ipmi/test_ipmi_network_verification.robot
@@ -95,7 +95,7 @@
     ${lan_config}=  Get LAN Print Dict  ${CHANNEL_NUMBER}
 
     ${ipv4_addresses}=  Redfish.Get Attribute
-    ...  /redfish/v1/Managers/bmc/EthernetInterfaces/${active_channel_config['${CHANNEL_NUMBER}']['name']}
+    ...  /redfish/v1/Managers/${MANAGER_ID}/EthernetInterfaces/${active_channel_config['${CHANNEL_NUMBER}']['name']}
     ...  IPv4Addresses
 
     FOR  ${ipv4_address}  IN  @{ipv4_addresses}