diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index e85abb1..b286f19 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -1989,6 +1989,9 @@
 
             asyncResp->res.jsonValue["DateTime"] = crow::utility::dateTimeNow();
 
+            // TODO (Gunnar): Remove these one day since moved to ComputerSystem
+            // Still used by OCP profiles
+            // https://github.com/opencomputeproject/OCP-Profiles/issues/23
             // Fill in SerialConsole info
             asyncResp->res.jsonValue["SerialConsole"]["ServiceEnabled"] = true;
             asyncResp->res.jsonValue["SerialConsole"]["MaxConcurrentSessions"] =
diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
index 38e4034..60737ce 100644
--- a/redfish-core/lib/systems.hpp
+++ b/redfish-core/lib/systems.hpp
@@ -2109,6 +2109,29 @@
                 {"Health", "OK"},
                 {"State", "Enabled"},
             };
+
+            // Fill in SerialConsole info
+            asyncResp->res.jsonValue["SerialConsole"]["MaxConcurrentSessions"] =
+                15;
+            asyncResp->res.jsonValue["SerialConsole"]["IPMI"] = {
+                {"ServiceEnabled", true},
+            };
+            // TODO (Gunnar): Should look for obmc-console-ssh@2200.service
+            asyncResp->res.jsonValue["SerialConsole"]["SSH"] = {
+                {"ServiceEnabled", true},
+                {"Port", 2200},
+                // https://github.com/openbmc/docs/blob/master/console.md
+                {"HotKeySequenceDisplay", "Press ~. to exit console"},
+            };
+
+#ifdef BMCWEB_ENABLE_KVM
+            // Fill in GraphicalConsole info
+            asyncResp->res.jsonValue["GraphicalConsole"] = {
+                {"ServiceEnabled", true},
+                {"MaxConcurrentSessions", 4},
+                {"ConnectTypesSupported", {"KVMIP"}},
+            };
+#endif // BMCWEB_ENABLE_KVM
             constexpr const std::array<const char*, 4> inventoryForSystems = {
                 "xyz.openbmc_project.Inventory.Item.Dimm",
                 "xyz.openbmc_project.Inventory.Item.Cpu",