diff --git a/homeassistant/components/cloud/manifest.json b/homeassistant/components/cloud/manifest.json
index 3a6d942f5eac8..97f581d3bf0bc 100644
--- a/homeassistant/components/cloud/manifest.json
+++ b/homeassistant/components/cloud/manifest.json
@@ -7,5 +7,6 @@
   "after_dependencies": ["google_assistant", "alexa"],
   "codeowners": ["@home-assistant/cloud"],
   "iot_class": "cloud_push",
-  "loggers": ["hass_nabucasa"]
+  "loggers": ["hass_nabucasa"],
+  "integration_type": "system"
 }
diff --git a/homeassistant/components/homeassistant_alerts/manifest.json b/homeassistant/components/homeassistant_alerts/manifest.json
index 20e6447dadf5c..d6f6d9ab61479 100644
--- a/homeassistant/components/homeassistant_alerts/manifest.json
+++ b/homeassistant/components/homeassistant_alerts/manifest.json
@@ -4,5 +4,6 @@
   "config_flow": false,
   "documentation": "https://www.home-assistant.io/integrations/homeassistant_alerts",
   "codeowners": ["@home-assistant/core"],
-  "quality_scale": "internal"
+  "quality_scale": "internal",
+  "integration_type": "system"
 }
diff --git a/homeassistant/components/map/manifest.json b/homeassistant/components/map/manifest.json
index f78dcfd20ba36..ed45ab069fa6b 100644
--- a/homeassistant/components/map/manifest.json
+++ b/homeassistant/components/map/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/map",
   "dependencies": ["frontend"],
   "codeowners": [],
-  "quality_scale": "internal"
+  "quality_scale": "internal",
+  "integration_type": "system"
 }
diff --git a/homeassistant/components/persistent_notification/manifest.json b/homeassistant/components/persistent_notification/manifest.json
index c21e8150d8a81..c60746e35b168 100644
--- a/homeassistant/components/persistent_notification/manifest.json
+++ b/homeassistant/components/persistent_notification/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/persistent_notification",
   "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal",
-  "iot_class": "local_push"
+  "iot_class": "local_push",
+  "integration_type": "system"
 }
diff --git a/homeassistant/components/stream/manifest.json b/homeassistant/components/stream/manifest.json
index fad6b80c3fb94..1f79da2054254 100644
--- a/homeassistant/components/stream/manifest.json
+++ b/homeassistant/components/stream/manifest.json
@@ -6,5 +6,6 @@
   "dependencies": ["http"],
   "codeowners": ["@hunterjm", "@uvjustin", "@allenporter"],
   "quality_scale": "internal",
-  "iot_class": "local_push"
+  "iot_class": "local_push",
+  "integration_type": "system"
 }
diff --git a/homeassistant/components/system_log/manifest.json b/homeassistant/components/system_log/manifest.json
index d31ce0d848580..abbc637037b67 100644
--- a/homeassistant/components/system_log/manifest.json
+++ b/homeassistant/components/system_log/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/system_log",
   "dependencies": [],
   "codeowners": [],
-  "quality_scale": "internal"
+  "quality_scale": "internal",
+  "integration_type": "system"
 }
diff --git a/homeassistant/components/zone/manifest.json b/homeassistant/components/zone/manifest.json
index 019049a3b715e..fe039817c6494 100644
--- a/homeassistant/components/zone/manifest.json
+++ b/homeassistant/components/zone/manifest.json
@@ -4,5 +4,6 @@
   "config_flow": false,
   "documentation": "https://www.home-assistant.io/integrations/zone",
   "codeowners": ["@home-assistant/core"],
-  "quality_scale": "internal"
+  "quality_scale": "internal",
+  "integration_type": "system"
 }
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
index 49597366b997e..a26114843b62b 100644
--- a/homeassistant/generated/integrations.json
+++ b/homeassistant/generated/integrations.json
@@ -758,12 +758,6 @@
         }
       }
     },
-    "cloud": {
-      "name": "Home Assistant Cloud",
-      "integration_type": "hub",
-      "config_flow": false,
-      "iot_class": "cloud_push"
-    },
     "cloudflare": {
       "name": "Cloudflare",
       "integration_type": "hub",
@@ -2182,11 +2176,6 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
-    "homeassistant_alerts": {
-      "name": "Home Assistant Alerts",
-      "integration_type": "hub",
-      "config_flow": false
-    },
     "homeassistant_sky_connect": {
       "name": "Home Assistant Sky Connect",
       "integration_type": "hardware",
@@ -2972,11 +2961,6 @@
       "config_flow": false,
       "iot_class": "calculated"
     },
-    "map": {
-      "name": "Map",
-      "integration_type": "hub",
-      "config_flow": false
-    },
     "marantz": {
       "name": "Marantz",
       "integration_type": "virtual",
@@ -3921,12 +3905,6 @@
       "config_flow": false,
       "iot_class": "local_polling"
     },
-    "persistent_notification": {
-      "name": "Persistent Notification",
-      "integration_type": "hub",
-      "config_flow": false,
-      "iot_class": "local_push"
-    },
     "philips": {
       "name": "Philips",
       "integrations": {
@@ -5069,12 +5047,6 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
-    "stream": {
-      "name": "Stream",
-      "integration_type": "hub",
-      "config_flow": false,
-      "iot_class": "local_push"
-    },
     "streamlabswater": {
       "name": "StreamLabs",
       "integration_type": "hub",
@@ -5197,11 +5169,6 @@
       "config_flow": true,
       "iot_class": "local_push"
     },
-    "system_log": {
-      "name": "System Log",
-      "integration_type": "hub",
-      "config_flow": false
-    },
     "systemmonitor": {
       "name": "System Monitor",
       "integration_type": "hub",
@@ -6191,11 +6158,6 @@
       "config_flow": false,
       "iot_class": "local_polling"
     },
-    "zone": {
-      "name": "Zone",
-      "integration_type": "hub",
-      "config_flow": false
-    },
     "zoneminder": {
       "name": "ZoneMinder",
       "integration_type": "hub",