diff --git a/homeassistant/helpers/system_info.py b/homeassistant/helpers/system_info.py
index 293a6e7bcef..a857858de1b 100644
--- a/homeassistant/helpers/system_info.py
+++ b/homeassistant/helpers/system_info.py
@@ -36,11 +36,9 @@ async def async_get_system_info(hass: HomeAssistantType) -> Dict:
 
     # Determine installation type on current data
     if info_object["docker"]:
-        info_object["installation_type"] = "Home Assistant Core on Docker"
+        info_object["installation_type"] = "Home Assistant Container"
     elif is_virtual_env():
-        info_object[
-            "installation_type"
-        ] = "Home Assistant Core in a Python Virtual Environment"
+        info_object["installation_type"] = "Home Assistant Core"
 
     # Enrich with Supervisor information
     if hass.components.hassio.is_hassio():
@@ -50,6 +48,7 @@ async def async_get_system_info(hass: HomeAssistantType) -> Dict:
         info_object["supervisor"] = info.get("supervisor")
         info_object["host_os"] = host.get("operating_system")
         info_object["chassis"] = host.get("chassis")
+        info_object["docker_version"] = info.get("docker")
 
         if info.get("hassos") is not None:
             info_object["installation_type"] = "Home Assistant"