diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index 2df6034..5f5ef6e 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -944,8 +944,8 @@
         res.jsonValue["PowerState"] = "On";
         res.jsonValue["Status"] = {{"State", "Enabled"}, {"Health", "OK"}};
         res.jsonValue["ManagerType"] = "BMC";
-        res.jsonValue["UUID"] = uuid;
-        res.jsonValue["ServiceEntryPointUUID"] = systemd_utils::getUuid();
+        res.jsonValue["UUID"] = systemd_utils::getUuid();
+        res.jsonValue["ServiceEntryPointUUID"] = uuid;
         res.jsonValue["Model"] = "OpenBmc"; // TODO(ed), get model
 
         res.jsonValue["LogServices"] = {
diff --git a/redfish-core/lib/service_root.hpp b/redfish-core/lib/service_root.hpp
index a525ca6..ad2b2f2 100644
--- a/redfish-core/lib/service_root.hpp
+++ b/redfish-core/lib/service_root.hpp
@@ -27,6 +27,8 @@
   public:
     ServiceRoot(CrowApp& app) : Node(app, "/redfish/v1/")
     {
+        uuid = app.template getMiddleware<crow::persistent_data::Middleware>()
+                   .systemUuid;
         entityPrivileges = {
             {boost::beast::http::verb::get, {}},
             {boost::beast::http::verb::head, {}},
@@ -64,9 +66,11 @@
         res.jsonValue["UpdateService"] = {
             {"@odata.id", "/redfish/v1/UpdateService"}};
 
-        res.jsonValue["UUID"] = systemd_utils::getUuid();
+        res.jsonValue["UUID"] = uuid;
         res.end();
     }
+
+    std::string uuid;
 };
 
 } // namespace redfish