diff --git a/source/_integrations/3_day_blinds.markdown b/source/_integrations/3_day_blinds.markdown
index 273fd4f7a86..16d6206973b 100644
--- a/source/_integrations/3_day_blinds.markdown
+++ b/source/_integrations/3_day_blinds.markdown
@@ -4,18 +4,18 @@ description: Connect and control your 3 Day Blinds devices using the Motion Blin
 ha_category:
   - Cover
 ha_domain: 3_day_blinds
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/accuweather.markdown b/source/_integrations/accuweather.markdown
index e3ce0c896a3..e04f810ab04 100644
--- a/source/_integrations/accuweather.markdown
+++ b/source/_integrations/accuweather.markdown
@@ -14,7 +14,7 @@ ha_platforms:
   - diagnostics
   - sensor
   - weather
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The AccuWeather integration uses the [AccuWeather](https://accuweather.com/) web service as a source for weather data for your location.
diff --git a/source/_integrations/adguard.markdown b/source/_integrations/adguard.markdown
index e2e7bbb43a9..6006bbab057 100644
--- a/source/_integrations/adguard.markdown
+++ b/source/_integrations/adguard.markdown
@@ -14,7 +14,7 @@ ha_domain: adguard
 ha_platforms:
   - sensor
   - switch
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 AdGuard Home is a network-wide ad- and tracker-blocking DNS server with parental
diff --git a/source/_integrations/airly.markdown b/source/_integrations/airly.markdown
index b237471a8a0..ed003690be9 100644
--- a/source/_integrations/airly.markdown
+++ b/source/_integrations/airly.markdown
@@ -13,7 +13,7 @@ ha_quality_scale: platinum
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Airly integration uses the [Airly](https://airly.eu/) web service as a source for air quality data for your location.
diff --git a/source/_integrations/airnow.markdown b/source/_integrations/airnow.markdown
index bd0a139665e..e29e9cdaa72 100644
--- a/source/_integrations/airnow.markdown
+++ b/source/_integrations/airnow.markdown
@@ -10,6 +10,7 @@ ha_codeowners:
   - '@asymworks'
 ha_domain: airnow
 ha_platforms:
+  - diagnostics
   - sensor
 ha_integration_type: integration
 ---
diff --git a/source/_integrations/airthings_ble.markdown b/source/_integrations/airthings_ble.markdown
index 406d530310c..82d81b38b22 100644
--- a/source/_integrations/airthings_ble.markdown
+++ b/source/_integrations/airthings_ble.markdown
@@ -5,7 +5,7 @@ ha_category:
   - Environment
   - Sensor
 ha_release: '2022.11'
-ha_iot_class: Local Push
+ha_iot_class: Local Polling
 ha_codeowners:
   - '@vincegio'
 ha_domain: airthings_ble
@@ -48,4 +48,4 @@ Sensor entities added to Home Assistant, depending on the device model:
 - Temperature
 - VOC
 - Co2
-- Battery
\ No newline at end of file
+- Battery
diff --git a/source/_integrations/airvisual.markdown b/source/_integrations/airvisual.markdown
index 11caba2353d..b392719dbf6 100644
--- a/source/_integrations/airvisual.markdown
+++ b/source/_integrations/airvisual.markdown
@@ -12,7 +12,7 @@ ha_config_flow: true
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The `airvisual` sensor platform queries the [AirVisual](https://www.iqair.com) cloud API for air quality data. Data can be collected via latitude/longitude, by city/state/country, or from an [AirVisual Node/Pro unit](https://www.iqair.com/air-quality-monitors/airvisual-pro).
diff --git a/source/_integrations/alert.markdown b/source/_integrations/alert.markdown
index 05621c46c23..9077891255c 100644
--- a/source/_integrations/alert.markdown
+++ b/source/_integrations/alert.markdown
@@ -9,6 +9,7 @@ ha_quality_scale: internal
 ha_domain: alert
 ha_codeowners:
   - '@home-assistant/core'
+  - '@frenck'
 ha_integration_type: integration
 ---
 
diff --git a/source/_integrations/ambient_station.markdown b/source/_integrations/ambient_station.markdown
index 9e2c8223419..3bb52f055e2 100644
--- a/source/_integrations/ambient_station.markdown
+++ b/source/_integrations/ambient_station.markdown
@@ -13,7 +13,7 @@ ha_platforms:
   - binary_sensor
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The `Ambient Weather Station` integration retrieves local weather information
diff --git a/source/_integrations/amp_motorization.markdown b/source/_integrations/amp_motorization.markdown
index 975fc00af23..5035a0ffe62 100644
--- a/source/_integrations/amp_motorization.markdown
+++ b/source/_integrations/amp_motorization.markdown
@@ -4,18 +4,18 @@ description: Connect and control your AMP Motorization devices using the Motion
 ha_category:
   - Cover
 ha_domain: amp_motorization
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/august_ble.markdown b/source/_integrations/august_ble.markdown
index f82dab10e08..23917be0013 100644
--- a/source/_integrations/august_ble.markdown
+++ b/source/_integrations/august_ble.markdown
@@ -5,20 +5,20 @@ ha_category:
   - Binary Sensor
   - Lock
   - Sensor
-ha_bluetooth: true
 ha_release: 2022.9
-ha_iot_class: Local Push
+ha_domain: august_ble
+ha_integration_type: virtual
+ha_supporting_domain: yalexs_ble
+ha_supporting_integration: Yale Access Bluetooth
+ha_bluetooth: true
 ha_codeowners:
   - '@bdraco'
-ha_domain: august_ble
 ha_config_flow: true
 ha_platforms:
   - binary_sensor
   - lock
   - sensor
-ha_integration_type: integration
-ha_supporting_domain: yalexs_ble
-ha_supporting_integration: Yale Access Bluetooth
+ha_iot_class: Local Push
 ---
 
 Integrates [August](https://august.com/) locks over Bluetooth into Home Assistant.
diff --git a/source/_integrations/axis.markdown b/source/_integrations/axis.markdown
index 3ef48495bc6..b5bdd506078 100644
--- a/source/_integrations/axis.markdown
+++ b/source/_integrations/axis.markdown
@@ -23,7 +23,7 @@ ha_platforms:
   - diagnostics
   - light
   - switch
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 [Axis Communications](https://www.axis.com/) devices are surveillance cameras, speakers, access control and other security-related network connected hardware. Event API works with firmware 5.50 and newer.
diff --git a/source/_integrations/blebox.markdown b/source/_integrations/blebox.markdown
index 891aadeb611..5e8ab96116d 100644
--- a/source/_integrations/blebox.markdown
+++ b/source/_integrations/blebox.markdown
@@ -11,7 +11,7 @@ ha_codeowners:
   - '@riokuu'
 ha_domain: blebox
 ha_platforms:
-  - air_quality
+  - binary_sensor
   - button
   - climate
   - cover
diff --git a/source/_integrations/bliss_automation.markdown b/source/_integrations/bliss_automation.markdown
index e7851bb69f4..a1fbe430489 100644
--- a/source/_integrations/bliss_automation.markdown
+++ b/source/_integrations/bliss_automation.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Bliss Automation devices using the Motion
 ha_category:
   - Cover
 ha_domain: bliss_automation
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/bloc_blinds.markdown b/source/_integrations/bloc_blinds.markdown
index fe4ea502b36..11661c81800 100644
--- a/source/_integrations/bloc_blinds.markdown
+++ b/source/_integrations/bloc_blinds.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Bloc Blinds devices using the Motion Blind
 ha_category:
   - Cover
 ha_domain: bloc_blinds
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/braviatv.markdown b/source/_integrations/braviatv.markdown
index 51a4d14898e..bde701d0c4b 100644
--- a/source/_integrations/braviatv.markdown
+++ b/source/_integrations/braviatv.markdown
@@ -17,7 +17,7 @@ ha_platforms:
   - media_player
   - remote
 ha_ssdp: true
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The Bravia TV integration allows you to control a [Sony Bravia TV](https://www.sony.com/).
diff --git a/source/_integrations/brel_home.markdown b/source/_integrations/brel_home.markdown
index 77a06217e1a..297dca15e1a 100644
--- a/source/_integrations/brel_home.markdown
+++ b/source/_integrations/brel_home.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Brel Home devices using the Motion Blinds
 ha_category:
   - Cover
 ha_domain: brel_home
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/brother.markdown b/source/_integrations/brother.markdown
index 4b3c5921bee..4e5fa3f0a22 100644
--- a/source/_integrations/brother.markdown
+++ b/source/_integrations/brother.markdown
@@ -14,7 +14,7 @@ ha_zeroconf: true
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The `Brother Printer` integration allows you to read current data from your local Brother printer.
diff --git a/source/_integrations/bswitch.markdown b/source/_integrations/bswitch.markdown
index e1ecd617d48..cab36d9ac62 100644
--- a/source/_integrations/bswitch.markdown
+++ b/source/_integrations/bswitch.markdown
@@ -3,21 +3,25 @@ title: BSwitch
 description: Connect and control your BSwitch devices using the SwitchBee integration
 ha_category:
   - Button
+  - Climate
+  - Cover
   - Light
   - Switch
 ha_domain: bswitch
-ha_codeowners:
-  - '@jafar-atili'
-ha_integration_type: integration
-ha_config_flow: true
-ha_platforms:
-  - button
-  - light
-  - switch
-ha_iot_class: Local Polling
+ha_integration_type: virtual
 ha_supporting_domain: switchbee
 ha_supporting_integration: SwitchBee
 ha_release: '2022.10'
+ha_codeowners:
+  - '@jafar-atili'
+ha_config_flow: true
+ha_platforms:
+  - button
+  - climate
+  - cover
+  - light
+  - switch
+ha_iot_class: Local Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/bt_smarthub.markdown b/source/_integrations/bt_smarthub.markdown
index 993508842b5..d8a0c40fa78 100644
--- a/source/_integrations/bt_smarthub.markdown
+++ b/source/_integrations/bt_smarthub.markdown
@@ -6,7 +6,7 @@ ha_category:
 ha_release: 0.82
 ha_iot_class: Local Polling
 ha_codeowners:
-  - '@jxwolstenholme'
+  - '@typhoon2099'
 ha_domain: bt_smarthub
 ha_platforms:
   - device_tracker
diff --git a/source/_integrations/bticino.markdown b/source/_integrations/bticino.markdown
index 7dfb86efd0e..bf7a40d9b19 100644
--- a/source/_integrations/bticino.markdown
+++ b/source/_integrations/bticino.markdown
@@ -13,9 +13,12 @@ ha_category:
   - Switch
   - Weather
 ha_domain: bticino
+ha_integration_type: virtual
+ha_supporting_domain: netatmo
+ha_supporting_integration: Netatmo
+ha_release: '0.20'
 ha_codeowners:
   - '@cgtobi'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - camera
@@ -28,9 +31,6 @@ ha_platforms:
   - switch
 ha_iot_class: Cloud Polling
 ha_homekit: true
-ha_supporting_domain: netatmo
-ha_supporting_integration: Netatmo
-ha_release: '0.20'
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/bubendorff.markdown b/source/_integrations/bubendorff.markdown
index b4ad3290b67..a3daffbc186 100644
--- a/source/_integrations/bubendorff.markdown
+++ b/source/_integrations/bubendorff.markdown
@@ -13,9 +13,12 @@ ha_category:
   - Switch
   - Weather
 ha_domain: bubendorff
+ha_integration_type: virtual
+ha_supporting_domain: netatmo
+ha_supporting_integration: Netatmo
+ha_release: '0.20'
 ha_codeowners:
   - '@cgtobi'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - camera
@@ -28,9 +31,6 @@ ha_platforms:
   - switch
 ha_iot_class: Cloud Polling
 ha_homekit: true
-ha_supporting_domain: netatmo
-ha_supporting_integration: Netatmo
-ha_release: '0.20'
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/cloud.markdown b/source/_integrations/cloud.markdown
index 0bbb6dfec19..25f64ba07a0 100644
--- a/source/_integrations/cloud.markdown
+++ b/source/_integrations/cloud.markdown
@@ -13,7 +13,7 @@ ha_platforms:
   - binary_sensor
   - stt
   - tts
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The Home Assistant Cloud allows you to quickly integrate your local Home Assistant with various cloud services like Amazon Alexa and Google Assistant. [Learn more.](/cloud)
diff --git a/source/_integrations/cozytouch.markdown b/source/_integrations/cozytouch.markdown
index 8d0ebb3e81a..bc2c1baf1c8 100644
--- a/source/_integrations/cozytouch.markdown
+++ b/source/_integrations/cozytouch.markdown
@@ -17,11 +17,14 @@ ha_category:
   - Siren
   - Switch
 ha_domain: cozytouch
+ha_integration_type: virtual
+ha_supporting_domain: overkiz
+ha_supporting_integration: Overkiz
+ha_release: 2022.2
 ha_codeowners:
   - '@imicknl'
   - '@vlebourl'
   - '@tetienne'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - alarm_control_panel
@@ -39,11 +42,8 @@ ha_platforms:
   - siren
   - switch
 ha_iot_class: Cloud Polling
-ha_zeroconf: true
 ha_dhcp: true
-ha_supporting_domain: overkiz
-ha_supporting_integration: Overkiz
-ha_release: 2022.2
+ha_zeroconf: true
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/cpuspeed.markdown b/source/_integrations/cpuspeed.markdown
index ef46239865c..d36e52f0e37 100644
--- a/source/_integrations/cpuspeed.markdown
+++ b/source/_integrations/cpuspeed.markdown
@@ -13,7 +13,7 @@ ha_config_flow: true
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The CPU Speed integration allows you to monitor the current CPU speed.
diff --git a/source/_integrations/dacia.markdown b/source/_integrations/dacia.markdown
index 901c17f420a..fe6358422b0 100644
--- a/source/_integrations/dacia.markdown
+++ b/source/_integrations/dacia.markdown
@@ -8,9 +8,12 @@ ha_category:
   - Select
   - Sensor
 ha_domain: dacia
+ha_integration_type: virtual
+ha_supporting_domain: renault
+ha_supporting_integration: Renault
+ha_release: 2021.8
 ha_codeowners:
   - '@epenet'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - binary_sensor
@@ -20,9 +23,6 @@ ha_platforms:
   - select
   - sensor
 ha_iot_class: Cloud Polling
-ha_supporting_domain: renault
-ha_supporting_integration: Renault
-ha_release: 2021.8
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/debugpy.markdown b/source/_integrations/debugpy.markdown
index c2525d75a75..edceb4421f2 100644
--- a/source/_integrations/debugpy.markdown
+++ b/source/_integrations/debugpy.markdown
@@ -9,7 +9,7 @@ ha_codeowners:
 ha_domain: debugpy
 ha_quality_scale: internal
 ha_iot_class: Local Push
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The remote Python debugger integration allows you to use the Visual Studio Code
diff --git a/source/_integrations/deconz.markdown b/source/_integrations/deconz.markdown
index 0b83c8d2c93..682bbae3ecd 100644
--- a/source/_integrations/deconz.markdown
+++ b/source/_integrations/deconz.markdown
@@ -37,7 +37,7 @@ ha_platforms:
   - sensor
   - siren
   - switch
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 [deCONZ](https://www.dresden-elektronik.de/funk/software/deconz.html) by [dresden elektronik](https://www.dresden-elektronik.de) is a software that communicates with ConBee/RaspBee Zigbee gateways and exposes Zigbee devices that are connected to the gateway.
diff --git a/source/_integrations/devolo_home_control.markdown b/source/_integrations/devolo_home_control.markdown
index fae92419f97..3875e5bc697 100755
--- a/source/_integrations/devolo_home_control.markdown
+++ b/source/_integrations/devolo_home_control.markdown
@@ -26,7 +26,7 @@ ha_platforms:
   - siren
   - switch
 ha_zeroconf: true
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 devolo Home Control is a Z-Wave ecosystem with a Z-Wave to IP gateway in the center. The integration allows you to control devices connected to the gateway.
diff --git a/source/_integrations/devolo_home_network.markdown b/source/_integrations/devolo_home_network.markdown
index eafcd5de54b..d08b5aad986 100755
--- a/source/_integrations/devolo_home_network.markdown
+++ b/source/_integrations/devolo_home_network.markdown
@@ -18,7 +18,7 @@ ha_platforms:
   - device_tracker
   - sensor
 ha_zeroconf: true
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The devolo Home Network integration allows you to monitor your PLC network.
diff --git a/source/_integrations/diaz.markdown b/source/_integrations/diaz.markdown
new file mode 100644
index 00000000000..bf407beb823
--- /dev/null
+++ b/source/_integrations/diaz.markdown
@@ -0,0 +1,21 @@
+---
+title: Diaz
+description: Connect and control your Diaz devices using the Motion Blinds integration
+ha_category:
+  - Cover
+ha_domain: diaz
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
+ha_codeowners:
+  - '@starkillerOG'
+ha_config_flow: true
+ha_platforms:
+  - cover
+  - sensor
+ha_iot_class: Local Push
+ha_dhcp: true
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/digital_loggers.markdown b/source/_integrations/digital_loggers.markdown
index e0b5d5296f5..2ec329dc28a 100644
--- a/source/_integrations/digital_loggers.markdown
+++ b/source/_integrations/digital_loggers.markdown
@@ -8,9 +8,12 @@ ha_category:
   - Light
   - Switch
 ha_domain: digital_loggers
+ha_integration_type: virtual
+ha_supporting_domain: wemo
+ha_supporting_integration: Belkin WeMo
+ha_release: pre 0.7
 ha_codeowners:
   - '@esev'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - binary_sensor
@@ -19,11 +22,8 @@ ha_platforms:
   - sensor
   - switch
 ha_iot_class: Local Push
-ha_ssdp: true
 ha_homekit: true
-ha_supporting_domain: wemo
-ha_supporting_integration: Belkin WeMo
-ha_release: pre 0.7
+ha_ssdp: true
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/dooya.markdown b/source/_integrations/dooya.markdown
index 8fb43fff34a..be4e6b48b5b 100644
--- a/source/_integrations/dooya.markdown
+++ b/source/_integrations/dooya.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Dooya devices using the Motion Blinds inte
 ha_category:
   - Cover
 ha_domain: dooya
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/dsmr.markdown b/source/_integrations/dsmr.markdown
index 52004327f0a..57a3a250f9f 100644
--- a/source/_integrations/dsmr.markdown
+++ b/source/_integrations/dsmr.markdown
@@ -13,7 +13,7 @@ ha_codeowners:
   - '@frenck'
 ha_platforms:
   - sensor
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 A sensor platform for Belgian, Dutch, Luxembourg and Swedish Smart Meters which comply to DSMR (Dutch Smart Meter Requirements), also known as 'Slimme meter' or 'P1 poort'. Swedish meters with a 'HAN port' are not supported by this integration.
diff --git a/source/_integrations/edl21.markdown b/source/_integrations/edl21.markdown
index 22ffceb610e..62153f01a4e 100644
--- a/source/_integrations/edl21.markdown
+++ b/source/_integrations/edl21.markdown
@@ -6,8 +6,6 @@ ha_category:
 ha_iot_class: Local Push
 ha_release: 0.107
 ha_domain: edl21
-ha_codeowners:
-  - '@mtdcr'
 ha_platforms:
   - sensor
 ha_integration_type: integration
diff --git a/source/_integrations/elgato.markdown b/source/_integrations/elgato.markdown
index 97a2eed45ac..3b010b62f5e 100644
--- a/source/_integrations/elgato.markdown
+++ b/source/_integrations/elgato.markdown
@@ -15,7 +15,7 @@ ha_platforms:
   - button
   - diagnostics
   - light
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The [Elgato](https://www.elgato.com/) Lights sets the bar for high-end studio
diff --git a/source/_integrations/enphase_envoy.markdown b/source/_integrations/enphase_envoy.markdown
index 8d501f5307f..c06a41e91c7 100644
--- a/source/_integrations/enphase_envoy.markdown
+++ b/source/_integrations/enphase_envoy.markdown
@@ -11,6 +11,7 @@ ha_config_flow: true
 ha_codeowners:
   - '@gtdiehl'
 ha_platforms:
+  - diagnostics
   - sensor
 ha_integration_type: integration
 ---
diff --git a/source/_integrations/esphome.markdown b/source/_integrations/esphome.markdown
index a7f3b2f2bfb..f61d37e7aba 100644
--- a/source/_integrations/esphome.markdown
+++ b/source/_integrations/esphome.markdown
@@ -27,7 +27,7 @@ ha_platforms:
   - select
   - sensor
   - switch
-ha_integration_type: integration
+ha_integration_type: device
 ha_dhcp: true
 works_with:
   - local
diff --git a/source/_integrations/flexom.markdown b/source/_integrations/flexom.markdown
index d7ae3d11c5e..b4a6566106c 100644
--- a/source/_integrations/flexom.markdown
+++ b/source/_integrations/flexom.markdown
@@ -17,11 +17,14 @@ ha_category:
   - Siren
   - Switch
 ha_domain: flexom
+ha_integration_type: virtual
+ha_supporting_domain: overkiz
+ha_supporting_integration: Overkiz
+ha_release: 2022.2
 ha_codeowners:
   - '@imicknl'
   - '@vlebourl'
   - '@tetienne'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - alarm_control_panel
@@ -39,11 +42,8 @@ ha_platforms:
   - siren
   - switch
 ha_iot_class: Cloud Polling
-ha_zeroconf: true
 ha_dhcp: true
-ha_supporting_domain: overkiz
-ha_supporting_integration: Overkiz
-ha_release: 2022.2
+ha_zeroconf: true
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/forecast_solar.markdown b/source/_integrations/forecast_solar.markdown
index a7cc29abf52..cdbec7fcd2d 100644
--- a/source/_integrations/forecast_solar.markdown
+++ b/source/_integrations/forecast_solar.markdown
@@ -14,7 +14,7 @@ ha_platforms:
   - diagnostics
   - sensor
 ha_quality_scale: platinum
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The [Forecast.Solar](https://forecast.solar/) service provides solar production
diff --git a/source/_integrations/forked_daapd.markdown b/source/_integrations/forked_daapd.markdown
index 47c8a932c8a..ef829a445bd 100644
--- a/source/_integrations/forked_daapd.markdown
+++ b/source/_integrations/forked_daapd.markdown
@@ -3,11 +3,11 @@ title: Owntone
 description: Instructions on how to integrate an Owntone server into Home Assistant.
 ha_category:
   - Media Player
-ha_release: "0.110"
+ha_release: '0.110'
 ha_iot_class: Local Push
 ha_domain: forked_daapd
 ha_codeowners:
-  - "@uvjustin"
+  - '@uvjustin'
 ha_config_flow: true
 ha_zeroconf: true
 ha_platforms:
diff --git a/source/_integrations/fritzbox_callmonitor.markdown b/source/_integrations/fritzbox_callmonitor.markdown
index 414a570bda2..077044e40bf 100644
--- a/source/_integrations/fritzbox_callmonitor.markdown
+++ b/source/_integrations/fritzbox_callmonitor.markdown
@@ -9,7 +9,7 @@ ha_domain: fritzbox_callmonitor
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: integration
+ha_integration_type: device
 ha_codeowners:
   - '@cdce8p'
 ---
diff --git a/source/_integrations/gaviota.markdown b/source/_integrations/gaviota.markdown
index e61429f0986..5d90b425fab 100644
--- a/source/_integrations/gaviota.markdown
+++ b/source/_integrations/gaviota.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Gaviota devices using the Motion Blinds in
 ha_category:
   - Cover
 ha_domain: gaviota
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/gios.markdown b/source/_integrations/gios.markdown
index 212da2a4fce..77da90c8aa5 100644
--- a/source/_integrations/gios.markdown
+++ b/source/_integrations/gios.markdown
@@ -13,7 +13,7 @@ ha_quality_scale: platinum
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The `gios` integration uses the [GIOŚ](http://powietrze.gios.gov.pl/pjp/current) web service as a source for air quality data for your location.
diff --git a/source/_integrations/guardian.markdown b/source/_integrations/guardian.markdown
index 2d80d271f8c..74be90a680d 100644
--- a/source/_integrations/guardian.markdown
+++ b/source/_integrations/guardian.markdown
@@ -20,7 +20,7 @@ ha_platforms:
   - sensor
   - switch
 ha_dhcp: true
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The `guardian` integration integrates
diff --git a/source/_integrations/hassio.markdown b/source/_integrations/hassio.markdown
index f5624335ae2..1bc143ec49c 100644
--- a/source/_integrations/hassio.markdown
+++ b/source/_integrations/hassio.markdown
@@ -16,7 +16,7 @@ ha_platforms:
   - update
 ha_codeowners:
   - '@home-assistant/supervisor'
-ha_integration_type: system
+ha_integration_type: integration
 ---
 
 Supervisor integration allows you to monitor and control Supervisor add-ons and operating system from Home Assistant.
diff --git a/source/_integrations/havana_shade.markdown b/source/_integrations/havana_shade.markdown
new file mode 100644
index 00000000000..efa7b8b1037
--- /dev/null
+++ b/source/_integrations/havana_shade.markdown
@@ -0,0 +1,21 @@
+---
+title: Havana Shade
+description: Connect and control your Havana Shade devices using the Motion Blinds integration
+ha_category:
+  - Cover
+ha_domain: havana_shade
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
+ha_codeowners:
+  - '@starkillerOG'
+ha_config_flow: true
+ha_platforms:
+  - cover
+  - sensor
+ha_iot_class: Local Push
+ha_dhcp: true
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/heiwa.markdown b/source/_integrations/heiwa.markdown
index 347299756f0..55c5a9b6341 100644
--- a/source/_integrations/heiwa.markdown
+++ b/source/_integrations/heiwa.markdown
@@ -3,18 +3,18 @@ title: Heiwa
 description: Connect and control your Heiwa devices using the Gree Climate integration
 ha_category:
   - Climate
-ha_release: 2022.11.0
-ha_iot_class: Local Polling
-ha_config_flow: true
-ha_codeowners:
-  - '@renaiku'
+ha_release: 0.117
 ha_domain: heiwa
+ha_integration_type: virtual
+ha_supporting_domain: gree
+ha_supporting_integration: Gree Climate
+ha_codeowners:
+  - '@cmroche'
+ha_config_flow: true
 ha_platforms:
   - climate
   - switch
-ha_integration_type: integration
-ha_supporting_domain: gree
-ha_supporting_integration: Gree Climate
+ha_iot_class: Local Polling
 ---
 
-{% include integrations/supported_brand.md %}
\ No newline at end of file
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/hi_kumo.markdown b/source/_integrations/hi_kumo.markdown
index b9dc7b509fc..c66114cb9ee 100644
--- a/source/_integrations/hi_kumo.markdown
+++ b/source/_integrations/hi_kumo.markdown
@@ -17,11 +17,14 @@ ha_category:
   - Siren
   - Switch
 ha_domain: hi_kumo
+ha_integration_type: virtual
+ha_supporting_domain: overkiz
+ha_supporting_integration: Overkiz
+ha_release: 2022.2
 ha_codeowners:
   - '@imicknl'
   - '@vlebourl'
   - '@tetienne'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - alarm_control_panel
@@ -39,11 +42,8 @@ ha_platforms:
   - siren
   - switch
 ha_iot_class: Cloud Polling
-ha_zeroconf: true
 ha_dhcp: true
-ha_supporting_domain: overkiz
-ha_supporting_integration: Overkiz
-ha_release: 2022.2
+ha_zeroconf: true
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/homeassistant_alerts.markdown b/source/_integrations/homeassistant_alerts.markdown
index f98ba10ee55..2d9b2842ab6 100644
--- a/source/_integrations/homeassistant_alerts.markdown
+++ b/source/_integrations/homeassistant_alerts.markdown
@@ -7,7 +7,7 @@ ha_category:
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: homeassistant_alerts
-ha_integration_type: integration
+ha_integration_type: system
 ha_quality_scale: internal
 ---
 
diff --git a/source/_integrations/hue.markdown b/source/_integrations/hue.markdown
index 83baadccef5..924520fbcc2 100644
--- a/source/_integrations/hue.markdown
+++ b/source/_integrations/hue.markdown
@@ -23,7 +23,7 @@ ha_platforms:
   - sensor
   - switch
 ha_zeroconf: true
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The Philips Hue integration allows you to control and monitor the lights and sensors connected to your Hue bridge.
diff --git a/source/_integrations/hurrican_shutters_wholesale.markdown b/source/_integrations/hurrican_shutters_wholesale.markdown
index 02955313c61..03b283762fb 100644
--- a/source/_integrations/hurrican_shutters_wholesale.markdown
+++ b/source/_integrations/hurrican_shutters_wholesale.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Hurrican Shutters Wholesale devices using
 ha_category:
   - Cover
 ha_domain: hurrican_shutters_wholesale
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/inspired_shades.markdown b/source/_integrations/inspired_shades.markdown
new file mode 100644
index 00000000000..72a6854504a
--- /dev/null
+++ b/source/_integrations/inspired_shades.markdown
@@ -0,0 +1,21 @@
+---
+title: Inspired Shades
+description: Connect and control your Inspired Shades devices using the Motion Blinds integration
+ha_category:
+  - Cover
+ha_domain: inspired_shades
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
+ha_codeowners:
+  - '@starkillerOG'
+ha_config_flow: true
+ha_platforms:
+  - cover
+  - sensor
+ha_iot_class: Local Push
+ha_dhcp: true
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/iqvia.markdown b/source/_integrations/iqvia.markdown
index aa0ab692926..e17ca809b58 100644
--- a/source/_integrations/iqvia.markdown
+++ b/source/_integrations/iqvia.markdown
@@ -12,7 +12,7 @@ ha_domain: iqvia
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The `iqvia` sensor platform collects and displays allergy, asthma and disease
diff --git a/source/_integrations/ismartwindow.markdown b/source/_integrations/ismartwindow.markdown
index 0646162c16d..ac1fd715cc7 100644
--- a/source/_integrations/ismartwindow.markdown
+++ b/source/_integrations/ismartwindow.markdown
@@ -4,18 +4,18 @@ description: Connect and control your iSmartWindow devices using the Motion Blin
 ha_category:
   - Cover
 ha_domain: ismartwindow
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/iss.markdown b/source/_integrations/iss.markdown
index 1bcbc85086e..ff00c58f607 100644
--- a/source/_integrations/iss.markdown
+++ b/source/_integrations/iss.markdown
@@ -11,7 +11,7 @@ ha_platforms:
 ha_codeowners:
   - '@DurgNomis-drol'
 ha_config_flow: true
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The International Space Station (ISS) integration uses the
diff --git a/source/_integrations/isy994.markdown b/source/_integrations/isy994.markdown
index d0a4cb243e6..015110725bb 100644
--- a/source/_integrations/isy994.markdown
+++ b/source/_integrations/isy994.markdown
@@ -29,7 +29,7 @@ ha_platforms:
   - sensor
   - switch
 ha_dhcp: true
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The ISY994 is a home automation controller that is capable of controlling Insteon and X10 devices. Some models of the ISY994 can even control Z-Wave devices.
diff --git a/source/_integrations/jellyfin.markdown b/source/_integrations/jellyfin.markdown
index 3d101b3bc5b..732d1347f4b 100644
--- a/source/_integrations/jellyfin.markdown
+++ b/source/_integrations/jellyfin.markdown
@@ -13,9 +13,10 @@ ha_codeowners:
 ha_config_flow: true
 ha_domain: jellyfin
 ha_platforms:
+  - diagnostics
   - media_player
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Jellyfin integration exposes a [Jellyfin](https://jellyfin.org/) server as a Media Source in Home Assistant.
diff --git a/source/_integrations/knx.markdown b/source/_integrations/knx.markdown
index 8b9a939d35f..d19917800b5 100644
--- a/source/_integrations/knx.markdown
+++ b/source/_integrations/knx.markdown
@@ -40,7 +40,7 @@ ha_platforms:
   - switch
   - weather
 ha_config_flow: true
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The [KNX](https://www.knx.org) integration for Home Assistant allows you to connect to KNX/IP devices.
diff --git a/source/_integrations/lametric.markdown b/source/_integrations/lametric.markdown
index 807232eed33..e6343c9e10a 100644
--- a/source/_integrations/lametric.markdown
+++ b/source/_integrations/lametric.markdown
@@ -13,18 +13,21 @@ ha_release: 0.49
 ha_codeowners:
   - '@robbiet480'
   - '@frenck'
+  - '@bachya'
 ha_domain: lametric
 ha_platforms:
   - button
+  - diagnostics
   - notify
   - number
   - select
   - sensor
   - switch
-ha_integration_type: integration
+ha_integration_type: device
 ha_config_flow: true
 ha_ssdp: true
 ha_dhcp: true
+ha_quality_scale: platinum
 ---
 
 [LaMetric TIME](https://lametric.com/) is a smart clock that can be used to access applications, listen to web radio and display notifications.
diff --git a/source/_integrations/launch_library.markdown b/source/_integrations/launch_library.markdown
index c8813bc14c3..3d116dc98be 100644
--- a/source/_integrations/launch_library.markdown
+++ b/source/_integrations/launch_library.markdown
@@ -13,7 +13,7 @@ ha_platforms:
   - diagnostics
   - sensor
 ha_config_flow: true
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The `launch_library` sensor will provide you with information about the next planned space launch and SpaceX Starship event.
diff --git a/source/_integrations/legrand.markdown b/source/_integrations/legrand.markdown
index f7bf94dec16..4676b3c62ef 100644
--- a/source/_integrations/legrand.markdown
+++ b/source/_integrations/legrand.markdown
@@ -13,9 +13,12 @@ ha_category:
   - Switch
   - Weather
 ha_domain: legrand
+ha_integration_type: virtual
+ha_supporting_domain: netatmo
+ha_supporting_integration: Netatmo
+ha_release: '0.20'
 ha_codeowners:
   - '@cgtobi'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - camera
@@ -28,9 +31,6 @@ ha_platforms:
   - switch
 ha_iot_class: Cloud Polling
 ha_homekit: true
-ha_supporting_domain: netatmo
-ha_supporting_integration: Netatmo
-ha_release: '0.20'
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/lifx.markdown b/source/_integrations/lifx.markdown
index e08eccf471e..e9197cfc0f5 100644
--- a/source/_integrations/lifx.markdown
+++ b/source/_integrations/lifx.markdown
@@ -12,8 +12,10 @@ ha_homekit: true
 ha_platforms:
   - binary_sensor
   - button
+  - diagnostics
   - light
   - select
+  - sensor
 ha_integration_type: integration
 ha_codeowners:
   - '@bdraco'
diff --git a/source/_integrations/luftdaten.markdown b/source/_integrations/luftdaten.markdown
index e661fb863af..162947d9f30 100644
--- a/source/_integrations/luftdaten.markdown
+++ b/source/_integrations/luftdaten.markdown
@@ -15,7 +15,7 @@ ha_domain: luftdaten
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The Sensor.Communtiy integration will query the open data API of [Sensor.Community](https://sensor.community) to monitor air quality and other weather data from a specific (self build) sensor station.
diff --git a/source/_integrations/lutron_caseta.markdown b/source/_integrations/lutron_caseta.markdown
index 20605bf9e7c..ab278dd3fba 100644
--- a/source/_integrations/lutron_caseta.markdown
+++ b/source/_integrations/lutron_caseta.markdown
@@ -4,13 +4,13 @@ description: Instructions on how to use Lutron Caseta devices with Home Assistan
 featured: true
 ha_category:
   - Binary Sensor
+  - Button
   - Cover
   - Fan
   - Hub
   - Light
   - Scene
   - Switch
-  - Button
 ha_release: 0.41
 ha_iot_class: Local Push
 ha_domain: lutron_caseta
@@ -23,13 +23,13 @@ ha_zeroconf: true
 ha_homekit: true
 ha_platforms:
   - binary_sensor
+  - button
   - cover
   - diagnostics
   - fan
   - light
   - scene
   - switch
-  - button
 ha_integration_type: integration
 ---
 
diff --git a/source/_integrations/luxaflex.markdown b/source/_integrations/luxaflex.markdown
index 0d0f2dc076f..18eec7c1192 100644
--- a/source/_integrations/luxaflex.markdown
+++ b/source/_integrations/luxaflex.markdown
@@ -5,27 +5,29 @@ ha_category:
   - Button
   - Cover
   - Scene
+  - Select
   - Sensor
 ha_domain: luxaflex
+ha_integration_type: virtual
+ha_supporting_domain: hunterdouglas_powerview
+ha_supporting_integration: Hunter Douglas PowerView
+ha_release: 0.15
 ha_codeowners:
   - '@bdraco'
   - '@kingy444'
   - '@trullock'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - button
   - cover
   - diagnostics
   - scene
+  - select
   - sensor
 ha_iot_class: Local Polling
-ha_zeroconf: true
-ha_homekit: true
 ha_dhcp: true
-ha_supporting_domain: hunterdouglas_powerview
-ha_supporting_integration: Hunter Douglas PowerView
-ha_release: 0.15
+ha_homekit: true
+ha_zeroconf: true
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/map.markdown b/source/_integrations/map.markdown
index de079f9a409..3702fe90909 100644
--- a/source/_integrations/map.markdown
+++ b/source/_integrations/map.markdown
@@ -6,7 +6,7 @@ ha_category:
 ha_release: 0.56
 ha_quality_scale: internal
 ha_domain: map
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 This offers a map on the frontend to display the location of tracked devices. To set up tracked devices, look at the [device tracker](/integrations/device_tracker/) documentation. This integration is by default enabled, unless you've disabled or removed the [`default_config:`](/integrations/default_config/) line from your configuration. If that is the case, the following example shows you how to enable this integration manually:
diff --git a/source/_integrations/marantz.markdown b/source/_integrations/marantz.markdown
index c04acbb6c0e..23f1eed96d2 100644
--- a/source/_integrations/marantz.markdown
+++ b/source/_integrations/marantz.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Marantz devices using the Denon AVR Networ
 ha_category:
   - Media Player
 ha_domain: marantz
+ha_integration_type: virtual
+ha_supporting_domain: denonavr
+ha_supporting_integration: Denon AVR Network Receivers
+ha_release: 0.7.2
 ha_codeowners:
   - '@ol-iver'
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - media_player
 ha_iot_class: Local Polling
 ha_ssdp: true
-ha_supporting_domain: denonavr
-ha_supporting_integration: Denon AVR Network Receivers
-ha_release: 0.7.2
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/martec.markdown b/source/_integrations/martec.markdown
index cd4679f478d..a108bd80c38 100644
--- a/source/_integrations/martec.markdown
+++ b/source/_integrations/martec.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Martec devices using the Motion Blinds int
 ha_category:
   - Cover
 ha_domain: martec
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/moon.markdown b/source/_integrations/moon.markdown
index 58543b71028..e5ec9508f68 100644
--- a/source/_integrations/moon.markdown
+++ b/source/_integrations/moon.markdown
@@ -13,7 +13,7 @@ ha_domain: moon
 ha_platforms:
   - sensor
 ha_config_flow: true
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Moon integration tracks the phases of the moon.
diff --git a/source/_integrations/mqtt.markdown b/source/_integrations/mqtt.markdown
index e0ba89561f2..c146e11fe51 100644
--- a/source/_integrations/mqtt.markdown
+++ b/source/_integrations/mqtt.markdown
@@ -3,6 +3,7 @@ title: MQTT
 description: Instructions on how to setup MQTT within Home Assistant.
 ha_category:
   - Hub
+  - Update
 featured: true
 ha_release: pre 0.7
 ha_iot_class: Local Push
diff --git a/source/_integrations/nam.markdown b/source/_integrations/nam.markdown
index 6ad7171e542..b21d249a435 100644
--- a/source/_integrations/nam.markdown
+++ b/source/_integrations/nam.markdown
@@ -15,7 +15,7 @@ ha_platforms:
   - sensor
 ha_quality_scale: platinum
 ha_zeroconf: true
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The Nettigo Air Monitor integration allows you to read temperature, humidity, pressure and air quality data from Nettigo Air Monitor devices. [Nettigo Air Monitor](https://air.nettigo.pl/?setlang=en) is a DIY air quality monitoring system with open source firmware, based on an open hardware project.
diff --git a/source/_integrations/nexity.markdown b/source/_integrations/nexity.markdown
index 5359cd7329d..75cfc0bdf22 100644
--- a/source/_integrations/nexity.markdown
+++ b/source/_integrations/nexity.markdown
@@ -17,11 +17,14 @@ ha_category:
   - Siren
   - Switch
 ha_domain: nexity
+ha_integration_type: virtual
+ha_supporting_domain: overkiz
+ha_supporting_integration: Overkiz
+ha_release: 2022.2
 ha_codeowners:
   - '@imicknl'
   - '@vlebourl'
   - '@tetienne'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - alarm_control_panel
@@ -39,11 +42,8 @@ ha_platforms:
   - siren
   - switch
 ha_iot_class: Cloud Polling
-ha_zeroconf: true
 ha_dhcp: true
-ha_supporting_domain: overkiz
-ha_supporting_integration: Overkiz
-ha_release: 2022.2
+ha_zeroconf: true
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/nextdns.markdown b/source/_integrations/nextdns.markdown
index e38f2384cb0..0f2e26d1e9a 100644
--- a/source/_integrations/nextdns.markdown
+++ b/source/_integrations/nextdns.markdown
@@ -15,7 +15,7 @@ ha_platforms:
   - diagnostics
   - sensor
   - switch
-ha_integration_type: integration
+ha_integration_type: service
 ha_quality_scale: platinum
 ---
 
diff --git a/source/_integrations/nibe_heatpump.markdown b/source/_integrations/nibe_heatpump.markdown
index 7366a552e0e..1297a0665b7 100644
--- a/source/_integrations/nibe_heatpump.markdown
+++ b/source/_integrations/nibe_heatpump.markdown
@@ -9,8 +9,6 @@ ha_config_flow: true
 ha_codeowners:
   - '@elupus'
 ha_domain: nibe_heatpump
-ha_ssdp: false
-ha_platforms:
 ha_platforms:
   - binary_sensor
   - number
diff --git a/source/_integrations/notion.markdown b/source/_integrations/notion.markdown
index 5e3725d2385..bc3f7e6e4d9 100644
--- a/source/_integrations/notion.markdown
+++ b/source/_integrations/notion.markdown
@@ -15,7 +15,7 @@ ha_platforms:
   - binary_sensor
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The `Notion` component retrieves data from [Notion](https://getnotion.com) wireless
diff --git a/source/_integrations/nutrichef.markdown b/source/_integrations/nutrichef.markdown
index 4aa03dd3ad2..0188dbfd363 100644
--- a/source/_integrations/nutrichef.markdown
+++ b/source/_integrations/nutrichef.markdown
@@ -3,18 +3,18 @@ title: Nutrichef
 description: Connect and control your Nutrichef devices using the INKBIRD integration
 ha_category:
   - Sensor
-ha_bluetooth: true
 ha_release: 2022.8
-ha_iot_class: Local Push
+ha_domain: nutrichef
+ha_integration_type: virtual
+ha_supporting_domain: inkbird
+ha_supporting_integration: INKBIRD
+ha_bluetooth: true
 ha_codeowners:
   - '@bdraco'
-ha_domain: nutrichef
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: integration
-ha_supporting_domain: inkbird
-ha_supporting_integration: INKBIRD
+ha_iot_class: Local Push
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/octoprint.markdown b/source/_integrations/octoprint.markdown
index e04158df716..37c5e4c78ee 100644
--- a/source/_integrations/octoprint.markdown
+++ b/source/_integrations/octoprint.markdown
@@ -17,8 +17,8 @@ ha_ssdp: true
 ha_platforms:
   - binary_sensor
   - button
-  - sensor
   - camera
+  - sensor
 ha_integration_type: integration
 ---
 
diff --git a/source/_integrations/oncue.markdown b/source/_integrations/oncue.markdown
index 55d3f45a3b1..2437fd14983 100644
--- a/source/_integrations/oncue.markdown
+++ b/source/_integrations/oncue.markdown
@@ -9,6 +9,7 @@ ha_release: 2022.2
 ha_config_flow: true
 ha_codeowners:
   - '@bdraco'
+  - '@peterager'
 ha_dhcp: true
 ha_domain: oncue
 ha_platforms:
diff --git a/source/_integrations/open_meteo.markdown b/source/_integrations/open_meteo.markdown
index 50fb5cdc64f..f69cd272d99 100644
--- a/source/_integrations/open_meteo.markdown
+++ b/source/_integrations/open_meteo.markdown
@@ -12,7 +12,7 @@ ha_domain: open_meteo
 ha_platforms:
   - diagnostics
   - weather
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Open-Meteo integration integrates the free weather forecast from
diff --git a/source/_integrations/openuv.markdown b/source/_integrations/openuv.markdown
index b5ead6caa89..51bb8696831 100644
--- a/source/_integrations/openuv.markdown
+++ b/source/_integrations/openuv.markdown
@@ -15,7 +15,7 @@ ha_platforms:
   - binary_sensor
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The `openuv` integration displays UV and Ozone data from [openuv.io](https://www.openuv.io/).
diff --git a/source/_integrations/pcs_lighting.markdown b/source/_integrations/pcs_lighting.markdown
new file mode 100644
index 00000000000..d33cae5d642
--- /dev/null
+++ b/source/_integrations/pcs_lighting.markdown
@@ -0,0 +1,21 @@
+---
+title: PCS Lighting
+description: Connect and control your PCS Lighting devices using the Universal Powerline Bus (UPB) integration
+ha_category:
+  - Light
+  - Scene
+ha_domain: pcs_lighting
+ha_integration_type: virtual
+ha_supporting_domain: upb
+ha_supporting_integration: Universal Powerline Bus (UPB)
+ha_release: '0.110'
+ha_codeowners:
+  - '@gwww'
+ha_config_flow: true
+ha_platforms:
+  - light
+  - scene
+ha_iot_class: Local Push
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/persistent_notification.markdown b/source/_integrations/persistent_notification.markdown
index df4da3f2d4f..3b46f16919f 100644
--- a/source/_integrations/persistent_notification.markdown
+++ b/source/_integrations/persistent_notification.markdown
@@ -9,7 +9,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: persistent_notification
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `persistent_notification` integration can be used to show a notification on the frontend that has to be dismissed by the user.
diff --git a/source/_integrations/plugwise.markdown b/source/_integrations/plugwise.markdown
index 99a53c303a3..8e2948d8272 100644
--- a/source/_integrations/plugwise.markdown
+++ b/source/_integrations/plugwise.markdown
@@ -26,7 +26,7 @@ ha_platforms:
   - select
   - sensor
   - switch
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 This enables [Plugwise](https://www.plugwise.com) components with a central Smile gateway to be integrated. This integration talks locally to your **Smile** interface, and you will need its password and IP address.
diff --git a/source/_integrations/pvoutput.markdown b/source/_integrations/pvoutput.markdown
index 34eee9326e0..b26b2b846d6 100644
--- a/source/_integrations/pvoutput.markdown
+++ b/source/_integrations/pvoutput.markdown
@@ -13,7 +13,7 @@ ha_platforms:
   - diagnostics
   - sensor
 ha_quality_scale: platinum
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The PVOutput integration consumes information from [PVOutput](https://pvoutput.org/) which was uploaded by your solar photovoltaic (PV) system.
diff --git a/source/_integrations/radio_browser.markdown b/source/_integrations/radio_browser.markdown
index cfd2101c04f..57c8216387c 100644
--- a/source/_integrations/radio_browser.markdown
+++ b/source/_integrations/radio_browser.markdown
@@ -10,7 +10,7 @@ ha_domain: radio_browser
 ha_config_flow: true
 ha_codeowners:
   - '@frenck'
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Radio Browser integration allows you to use the directory of
diff --git a/source/_integrations/rainmachine.markdown b/source/_integrations/rainmachine.markdown
index 1b410073002..675853e227d 100644
--- a/source/_integrations/rainmachine.markdown
+++ b/source/_integrations/rainmachine.markdown
@@ -23,7 +23,7 @@ ha_platforms:
   - update
 ha_zeroconf: true
 ha_homekit: true
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The RainMachine integration is the main integration to integrate all platforms related to [RainMachine smart Wi-Fi sprinkler controllers](https://www.rainmachine.com/).
diff --git a/source/_integrations/raven_rock_mfg.markdown b/source/_integrations/raven_rock_mfg.markdown
index 40fb8fa41fd..e4deec6d450 100644
--- a/source/_integrations/raven_rock_mfg.markdown
+++ b/source/_integrations/raven_rock_mfg.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Raven Rock MFG devices using the Motion Bl
 ha_category:
   - Cover
 ha_domain: raven_rock_mfg
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/rdw.markdown b/source/_integrations/rdw.markdown
index 610ac3cae90..a1db085ece0 100644
--- a/source/_integrations/rdw.markdown
+++ b/source/_integrations/rdw.markdown
@@ -16,7 +16,7 @@ ha_platforms:
   - binary_sensor
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 [RDW](https://www.rdw.nl) is the Netherlands Vehicle Authority. Their tasks
diff --git a/source/_integrations/recollect_waste.markdown b/source/_integrations/recollect_waste.markdown
index a6093ba5ef6..e4f5194b8de 100644
--- a/source/_integrations/recollect_waste.markdown
+++ b/source/_integrations/recollect_waste.markdown
@@ -12,7 +12,7 @@ ha_config_flow: true
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The `recollect_waste` integration allows you to track the next scheduled waste pickup and what type of waste from [ReCollect](https://recollect.net/waste-haulers/).
diff --git a/source/_integrations/remote_rpi_gpio.markdown b/source/_integrations/remote_rpi_gpio.markdown
index e809003dba4..c299fd4a560 100644
--- a/source/_integrations/remote_rpi_gpio.markdown
+++ b/source/_integrations/remote_rpi_gpio.markdown
@@ -1,5 +1,5 @@
 ---
-title: remote_rpi_gpio
+title: Raspberry Pi Remote GPIO
 description: Instructions on how to integrate the GPIO capability of a Remote Raspberry Pi into Home Assistant.
 ha_category:
   - Binary Sensor
diff --git a/source/_integrations/rexel.markdown b/source/_integrations/rexel.markdown
index c48c8befba0..805903a7149 100644
--- a/source/_integrations/rexel.markdown
+++ b/source/_integrations/rexel.markdown
@@ -17,11 +17,14 @@ ha_category:
   - Siren
   - Switch
 ha_domain: rexel
+ha_integration_type: virtual
+ha_supporting_domain: overkiz
+ha_supporting_integration: Overkiz
+ha_release: 2022.2
 ha_codeowners:
   - '@imicknl'
   - '@vlebourl'
   - '@tetienne'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - alarm_control_panel
@@ -39,11 +42,8 @@ ha_platforms:
   - siren
   - switch
 ha_iot_class: Cloud Polling
-ha_zeroconf: true
 ha_dhcp: true
-ha_supporting_domain: overkiz
-ha_supporting_integration: Overkiz
-ha_release: 2022.2
+ha_zeroconf: true
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/ridwell.markdown b/source/_integrations/ridwell.markdown
index ed650792bd4..93202149d64 100644
--- a/source/_integrations/ridwell.markdown
+++ b/source/_integrations/ridwell.markdown
@@ -13,7 +13,7 @@ ha_platforms:
   - diagnostics
   - sensor
   - switch
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Ridwell integration allows users to track waste recycling pickups scheduled with [Ridwell](https://www.ridwell.com).
diff --git a/source/_integrations/ring.markdown b/source/_integrations/ring.markdown
index 9d673036b1c..79c8e98851f 100644
--- a/source/_integrations/ring.markdown
+++ b/source/_integrations/ring.markdown
@@ -11,8 +11,6 @@ ha_category:
 ha_release: 0.42
 ha_iot_class: Cloud Polling
 ha_config_flow: true
-ha_codeowners:
-  - '@balloob'
 ha_domain: ring
 ha_dhcp: true
 ha_platforms:
diff --git a/source/_integrations/roborock.markdown b/source/_integrations/roborock.markdown
new file mode 100644
index 00000000000..9de58cdc5c6
--- /dev/null
+++ b/source/_integrations/roborock.markdown
@@ -0,0 +1,43 @@
+---
+title: Roborock
+description: Connect and control your Roborock devices using the Xiaomi Miio integration
+ha_category:
+  - Alarm
+  - Fan
+  - Health
+  - Hub
+  - Light
+  - Presence Detection
+  - Remote
+  - Vacuum
+ha_domain: roborock
+ha_integration_type: virtual
+ha_supporting_domain: xiaomi_miio
+ha_supporting_integration: Xiaomi Miio
+ha_release: 0.51
+ha_codeowners:
+  - '@rytilahti'
+  - '@syssi'
+  - '@starkillerOG'
+ha_config_flow: true
+ha_platforms:
+  - air_quality
+  - alarm_control_panel
+  - binary_sensor
+  - button
+  - device_tracker
+  - diagnostics
+  - fan
+  - humidifier
+  - light
+  - number
+  - remote
+  - select
+  - sensor
+  - switch
+  - vacuum
+ha_iot_class: Local Polling
+ha_zeroconf: true
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/roku.markdown b/source/_integrations/roku.markdown
index ce8cd0e15af..3dcd701713b 100644
--- a/source/_integrations/roku.markdown
+++ b/source/_integrations/roku.markdown
@@ -24,7 +24,7 @@ ha_platforms:
   - remote
   - select
   - sensor
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The Roku integration allows you to control a [Roku](https://www.roku.com/) device.
diff --git a/source/_integrations/scrape.markdown b/source/_integrations/scrape.markdown
index a0367415fd6..ecaf985ae1a 100644
--- a/source/_integrations/scrape.markdown
+++ b/source/_integrations/scrape.markdown
@@ -7,6 +7,8 @@ ha_release: 0.31
 ha_iot_class: Cloud Polling
 ha_codeowners:
   - '@fabaff'
+  - '@gjohansson-ST'
+  - '@epenet'
 ha_domain: scrape
 ha_platforms:
   - sensor
diff --git a/source/_integrations/screenaway.markdown b/source/_integrations/screenaway.markdown
new file mode 100644
index 00000000000..2d8012c2850
--- /dev/null
+++ b/source/_integrations/screenaway.markdown
@@ -0,0 +1,21 @@
+---
+title: ScreenAway
+description: Connect and control your ScreenAway devices using the Motion Blinds integration
+ha_category:
+  - Cover
+ha_domain: screenaway
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
+ha_codeowners:
+  - '@starkillerOG'
+ha_config_flow: true
+ha_platforms:
+  - cover
+  - sensor
+ha_iot_class: Local Push
+ha_dhcp: true
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/season.markdown b/source/_integrations/season.markdown
index 1700f035cd1..2e7907697d5 100644
--- a/source/_integrations/season.markdown
+++ b/source/_integrations/season.markdown
@@ -13,7 +13,7 @@ ha_platforms:
   - sensor
 ha_codeowners:
   - '@frenck'
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The season integration will provide the current astronomical or meteorological season (Spring, Summer, Autumn, Winter)
diff --git a/source/_integrations/sensorblue.markdown b/source/_integrations/sensorblue.markdown
index 5aa323fae4e..99b916ffb9f 100644
--- a/source/_integrations/sensorblue.markdown
+++ b/source/_integrations/sensorblue.markdown
@@ -3,18 +3,18 @@ title: SensorBlue
 description: Connect and control your SensorBlue devices using the ThermoBeacon integration
 ha_category:
   - Sensor
-ha_bluetooth: true
 ha_release: 2022.9
-ha_iot_class: Local Push
+ha_domain: sensorblue
+ha_integration_type: virtual
+ha_supporting_domain: thermobeacon
+ha_supporting_integration: ThermoBeacon
+ha_bluetooth: true
 ha_codeowners:
   - '@bdraco'
-ha_domain: sensorblue
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: integration
-ha_supporting_domain: thermobeacon
-ha_supporting_integration: ThermoBeacon
+ha_iot_class: Local Push
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/sentry.markdown b/source/_integrations/sentry.markdown
index 4c98a49c63f..febe05e1878 100644
--- a/source/_integrations/sentry.markdown
+++ b/source/_integrations/sentry.markdown
@@ -10,7 +10,7 @@ ha_codeowners:
   - '@dcramer'
   - '@frenck'
 ha_domain: sentry
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 <div class='note warning'>
diff --git a/source/_integrations/shelly.markdown b/source/_integrations/shelly.markdown
index 0e69c2b0ce8..72ca5b750e7 100644
--- a/source/_integrations/shelly.markdown
+++ b/source/_integrations/shelly.markdown
@@ -32,7 +32,7 @@ ha_platforms:
   - sensor
   - switch
   - update
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 Integrate [Shelly devices](https://shelly.cloud) into Home Assistant.
diff --git a/source/_integrations/simplisafe.markdown b/source/_integrations/simplisafe.markdown
index 8fbcbfec86b..13b12469ae7 100644
--- a/source/_integrations/simplisafe.markdown
+++ b/source/_integrations/simplisafe.markdown
@@ -19,7 +19,7 @@ ha_platforms:
   - lock
   - sensor
 ha_dhcp: true
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The `simplisafe` integration integrates [SimpliSafe home security](https://simplisafe.com) (V2 and V3) systems into Home Assistant. Multiple SimpliSafe accounts can be accommodated.
diff --git a/source/_integrations/simply_automated.markdown b/source/_integrations/simply_automated.markdown
new file mode 100644
index 00000000000..fdf86e0d5ac
--- /dev/null
+++ b/source/_integrations/simply_automated.markdown
@@ -0,0 +1,21 @@
+---
+title: Simply Automated
+description: Connect and control your Simply Automated devices using the Universal Powerline Bus (UPB) integration
+ha_category:
+  - Light
+  - Scene
+ha_domain: simply_automated
+ha_integration_type: virtual
+ha_supporting_domain: upb
+ha_supporting_integration: Universal Powerline Bus (UPB)
+ha_release: '0.110'
+ha_codeowners:
+  - '@gwww'
+ha_config_flow: true
+ha_platforms:
+  - light
+  - scene
+ha_iot_class: Local Push
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/slack.markdown b/source/_integrations/slack.markdown
index 0db56b4eb0f..242968d61ac 100644
--- a/source/_integrations/slack.markdown
+++ b/source/_integrations/slack.markdown
@@ -12,7 +12,7 @@ ha_codeowners:
   - '@tkdrob'
 ha_platforms:
   - notify
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The `slack` platform allows you to deliver notifications from Home Assistant to [Slack](https://slack.com/).
diff --git a/source/_integrations/smart_blinds.markdown b/source/_integrations/smart_blinds.markdown
index d0d2453daae..2034bdecc7d 100644
--- a/source/_integrations/smart_blinds.markdown
+++ b/source/_integrations/smart_blinds.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Smart Blinds devices using the Motion Blin
 ha_category:
   - Cover
 ha_domain: smart_blinds
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/smart_home.markdown b/source/_integrations/smart_home.markdown
index af3d88c0713..5ff7c3e700a 100644
--- a/source/_integrations/smart_home.markdown
+++ b/source/_integrations/smart_home.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Smart Home devices using the Motion Blinds
 ha_category:
   - Cover
 ha_domain: smart_home
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/smarther.markdown b/source/_integrations/smarther.markdown
index 3bd187365cd..db9ec1a3223 100644
--- a/source/_integrations/smarther.markdown
+++ b/source/_integrations/smarther.markdown
@@ -13,9 +13,12 @@ ha_category:
   - Switch
   - Weather
 ha_domain: smarther
+ha_integration_type: virtual
+ha_supporting_domain: netatmo
+ha_supporting_integration: Netatmo
+ha_release: '0.20'
 ha_codeowners:
   - '@cgtobi'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - camera
@@ -28,9 +31,6 @@ ha_platforms:
   - switch
 ha_iot_class: Cloud Polling
 ha_homekit: true
-ha_supporting_domain: netatmo
-ha_supporting_integration: Netatmo
-ha_release: '0.20'
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/snooz.markdown b/source/_integrations/snooz.markdown
index e1b32ee68de..5751f78bb1d 100644
--- a/source/_integrations/snooz.markdown
+++ b/source/_integrations/snooz.markdown
@@ -1,10 +1,10 @@
 ---
-title: SNOOZ
+title: Snooz
 description: Instructions on how to integrate SNOOZ devices into Home Assistant.
 ha_category:
   - Fan
 ha_bluetooth: true
-ha_release: "2022.11"
+ha_release: '2022.11'
 ha_iot_class: Local Push
 ha_codeowners:
   - '@AustinBrunkhorst'
diff --git a/source/_integrations/solaredge.markdown b/source/_integrations/solaredge.markdown
index 0b05eb58702..712c3d73393 100644
--- a/source/_integrations/solaredge.markdown
+++ b/source/_integrations/solaredge.markdown
@@ -13,7 +13,7 @@ ha_platforms:
   - sensor
 ha_codeowners:
   - '@frenck'
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The `solaredge` platform uses the [SolarEdge Monitoring API](https://www.solaredge.com/sites/default/files/se_monitoring_api.pdf) to allow you to get details from your SolarEdge solar power setup and integrate these in your Home Assistant installation.
diff --git a/source/_integrations/somfy.markdown b/source/_integrations/somfy.markdown
index 956d347f7d1..d11d6669009 100644
--- a/source/_integrations/somfy.markdown
+++ b/source/_integrations/somfy.markdown
@@ -17,11 +17,14 @@ ha_category:
   - Siren
   - Switch
 ha_domain: somfy
+ha_integration_type: virtual
+ha_supporting_domain: overkiz
+ha_supporting_integration: Overkiz
+ha_release: 2022.2
 ha_codeowners:
   - '@imicknl'
   - '@vlebourl'
   - '@tetienne'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - alarm_control_panel
@@ -39,11 +42,8 @@ ha_platforms:
   - siren
   - switch
 ha_iot_class: Cloud Polling
-ha_zeroconf: true
 ha_dhcp: true
-ha_supporting_domain: overkiz
-ha_supporting_integration: Overkiz
-ha_release: 2022.2
+ha_zeroconf: true
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/spotify.markdown b/source/_integrations/spotify.markdown
index 893bdf95f81..3266a0a58f0 100644
--- a/source/_integrations/spotify.markdown
+++ b/source/_integrations/spotify.markdown
@@ -13,7 +13,7 @@ ha_domain: spotify
 ha_zeroconf: true
 ha_platforms:
   - media_player
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Spotify media player integration lets you control your Spotify
diff --git a/source/_integrations/stookalert.markdown b/source/_integrations/stookalert.markdown
index 67ee2be959e..3b509e6f748 100644
--- a/source/_integrations/stookalert.markdown
+++ b/source/_integrations/stookalert.markdown
@@ -14,7 +14,7 @@ ha_config_flow: true
 ha_platforms:
   - binary_sensor
   - diagnostics
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Stookalert integration queries the [RIVM Stookalert](https://www.rivm.nl/stookalert) API for unfavorable weather conditions or poor air quality. With a Stookalert, the RIVM calls on people not to burn wood. This can prevent health problems in people in the area.
diff --git a/source/_integrations/stream.markdown b/source/_integrations/stream.markdown
index e2a685c66a7..179ad0d18cf 100644
--- a/source/_integrations/stream.markdown
+++ b/source/_integrations/stream.markdown
@@ -13,7 +13,7 @@ ha_codeowners:
 ha_domain: stream
 ha_platforms:
   - diagnostics
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The stream integration provides a way to proxy live streams through Home Assistant. Most users should not need to configure anything or interface with the component directly since it is an internal component used by the [camera integration](/integrations/camera).
diff --git a/source/_integrations/switcher_kis.markdown b/source/_integrations/switcher_kis.markdown
index a567cd1fd9e..b7f47abcf16 100644
--- a/source/_integrations/switcher_kis.markdown
+++ b/source/_integrations/switcher_kis.markdown
@@ -13,7 +13,9 @@ ha_codeowners:
   - '@thecode'
 ha_domain: switcher_kis
 ha_platforms:
+  - climate
   - cover
+  - diagnostics
   - sensor
   - switch
 ha_config_flow: true
diff --git a/source/_integrations/symfonisk.markdown b/source/_integrations/symfonisk.markdown
index aad0b6c6bd9..2b64d389439 100644
--- a/source/_integrations/symfonisk.markdown
+++ b/source/_integrations/symfonisk.markdown
@@ -6,13 +6,13 @@ ha_category:
   - Sensor
 ha_domain: symfonisk
 ha_release: 0.7.3
-ha_iot_class: Local Push
-ha_config_flow: true
-ha_domain: sonos
+ha_integration_type: virtual
+ha_supporting_domain: sonos
+ha_supporting_integration: Sonos
 ha_codeowners:
   - '@cgtobi'
   - '@jjlawren'
-ha_ssdp: true
+ha_config_flow: true
 ha_platforms:
   - binary_sensor
   - diagnostics
@@ -20,10 +20,9 @@ ha_platforms:
   - number
   - sensor
   - switch
+ha_iot_class: Local Push
+ha_ssdp: true
 ha_zeroconf: true
-ha_integration_type: integration
-ha_supporting_domain: sonos
-ha_supporting_integration: Sonos
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/system_log.markdown b/source/_integrations/system_log.markdown
index b2e4889099e..a4e0d578c07 100644
--- a/source/_integrations/system_log.markdown
+++ b/source/_integrations/system_log.markdown
@@ -6,7 +6,7 @@ ha_category:
 ha_release: 0.58
 ha_quality_scale: internal
 ha_domain: system_log
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `system_log` integration stores information about all logged errors and warnings in Home Assistant. To view your logs, navigate to **Settings** -> **System** -> **Logs**. In order to not overload Home Assistant with log data, only the 50 last errors and warnings will be stored. Older entries are automatically discarded from the log. It is possible to change the number of stored log entries using the parameter `max_entries`.
diff --git a/source/_integrations/tailscale.markdown b/source/_integrations/tailscale.markdown
index 2055031abc7..387852e8a39 100644
--- a/source/_integrations/tailscale.markdown
+++ b/source/_integrations/tailscale.markdown
@@ -16,7 +16,7 @@ ha_platforms:
   - diagnostics
   - sensor
 ha_quality_scale: platinum
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The Tailscale integration integrates the [Tailscale](https://www.tailscale.com) API
diff --git a/source/_integrations/thermoplus.markdown b/source/_integrations/thermoplus.markdown
index 5881e64d8f8..4eaeb30e3db 100644
--- a/source/_integrations/thermoplus.markdown
+++ b/source/_integrations/thermoplus.markdown
@@ -3,18 +3,18 @@ title: ThermoPlus
 description: Connect and control your ThermoPlus devices using the ThermoBeacon integration
 ha_category:
   - Sensor
-ha_bluetooth: true
 ha_release: 2022.9
-ha_iot_class: Local Push
+ha_domain: thermoplus
+ha_integration_type: virtual
+ha_supporting_domain: thermobeacon
+ha_supporting_integration: ThermoBeacon
+ha_bluetooth: true
 ha_codeowners:
   - '@bdraco'
-ha_domain: thermoplus
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: integration
-ha_supporting_domain: thermobeacon
-ha_supporting_integration: ThermoBeacon
+ha_iot_class: Local Push
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/tile.markdown b/source/_integrations/tile.markdown
index 781210a7899..186a32d6cd7 100644
--- a/source/_integrations/tile.markdown
+++ b/source/_integrations/tile.markdown
@@ -12,7 +12,7 @@ ha_config_flow: true
 ha_platforms:
   - device_tracker
   - diagnostics
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The `tile` platform allows Home Assistant to utilize [Tile® Bluetooth trackers](https://www.thetileapp.com).
diff --git a/source/_integrations/tomorrowio.markdown b/source/_integrations/tomorrowio.markdown
index be055a392f6..ccca0e11491 100644
--- a/source/_integrations/tomorrowio.markdown
+++ b/source/_integrations/tomorrowio.markdown
@@ -16,7 +16,7 @@ ha_domain: tomorrowio
 ha_platforms:
   - sensor
   - weather
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Tomorrow.io integration allows you to obtain weather, air quality, pollen, and fire information from the [Tomorrow.io API](https://www.tomorrow.io/weather-api/).
diff --git a/source/_integrations/tractive.markdown b/source/_integrations/tractive.markdown
index 43b5295a5f9..82e454491f5 100644
--- a/source/_integrations/tractive.markdown
+++ b/source/_integrations/tractive.markdown
@@ -17,7 +17,7 @@ ha_platforms:
   - diagnostics
   - sensor
   - switch
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 [Tractive](https://tractive.com/en/) is an Austrian company that develops real-time location trackers for pets and other animals using GPS and GSM technology.
diff --git a/source/_integrations/tuya.markdown b/source/_integrations/tuya.markdown
index 75ed1867da7..c5b29fd322a 100644
--- a/source/_integrations/tuya.markdown
+++ b/source/_integrations/tuya.markdown
@@ -43,7 +43,7 @@ ha_platforms:
   - switch
   - vacuum
 ha_dhcp: true
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The Tuya integration integrates all Powered by Tuya devices you have added to the Tuya Smart and Tuya Smart Life apps.
diff --git a/source/_integrations/twentemilieu.markdown b/source/_integrations/twentemilieu.markdown
index 1e76206dcf1..b233d5351ff 100644
--- a/source/_integrations/twentemilieu.markdown
+++ b/source/_integrations/twentemilieu.markdown
@@ -16,7 +16,7 @@ ha_platforms:
   - diagnostics
   - sensor
 ha_quality_scale: platinum
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Twente Milieu integration allows you to track the next scheduled waste
diff --git a/source/_integrations/unifi.markdown b/source/_integrations/unifi.markdown
index 76fb7ae602e..b8eba69e80d 100644
--- a/source/_integrations/unifi.markdown
+++ b/source/_integrations/unifi.markdown
@@ -21,7 +21,7 @@ ha_platforms:
   - sensor
   - switch
   - update
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 [UniFi Network](https://www.ui.com/software/) by [Ubiquiti Networks, inc.](https://www.ui.com/) is a software that binds gateways, switches and wireless access points together with one graphical front end.
diff --git a/source/_integrations/upnp.markdown b/source/_integrations/upnp.markdown
index 5f6b4336c15..14470896409 100644
--- a/source/_integrations/upnp.markdown
+++ b/source/_integrations/upnp.markdown
@@ -10,13 +10,12 @@ ha_iot_class: Local Polling
 ha_config_flow: true
 ha_codeowners:
   - '@StevenLooman'
-  - '@ehendrix23'
 ha_domain: upnp
 ha_ssdp: true
 ha_platforms:
   - binary_sensor
   - sensor
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The `upnp` integration enables you to collect network statistics from your router such as bytes in/out and packets in/out, uptime, WAN IP address, and WAN connectivity status. This information is provided by the [UPnP](https://en.wikipedia.org/wiki/Universal_Plug_and_Play)/[Internet Gateway Device (IGD) Protocol](https://en.wikipedia.org/wiki/Internet_Gateway_Device_Protocol) if enabled on your router.
diff --git a/source/_integrations/uprise_smart_shades.markdown b/source/_integrations/uprise_smart_shades.markdown
index e1801479748..bb8d689381c 100644
--- a/source/_integrations/uprise_smart_shades.markdown
+++ b/source/_integrations/uprise_smart_shades.markdown
@@ -4,18 +4,18 @@ description: Connect and control your Uprise Smart Shades devices using the Moti
 ha_category:
   - Cover
 ha_domain: uprise_smart_shades
+ha_integration_type: virtual
+ha_supporting_domain: motion_blinds
+ha_supporting_integration: Motion Blinds
+ha_release: 2020.12
 ha_codeowners:
   - '@starkillerOG'
-ha_integration_type: integration
 ha_config_flow: true
 ha_platforms:
   - cover
   - sensor
 ha_iot_class: Local Push
 ha_dhcp: true
-ha_supporting_domain: motion_blinds
-ha_supporting_integration: Motion Blinds
-ha_release: 2020.12
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/uptime.markdown b/source/_integrations/uptime.markdown
index 727db934cdc..a526d04479b 100644
--- a/source/_integrations/uptime.markdown
+++ b/source/_integrations/uptime.markdown
@@ -13,7 +13,7 @@ ha_platforms:
 ha_config_flow: true
 ha_codeowners:
   - '@frenck'
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The uptime integration provides a sensor that stores the timestamp
diff --git a/source/_integrations/velbus.markdown b/source/_integrations/velbus.markdown
index ef325f26821..f2fdfb70ca6 100644
--- a/source/_integrations/velbus.markdown
+++ b/source/_integrations/velbus.markdown
@@ -3,11 +3,11 @@ title: Velbus
 description: Access and control your Velbus devices.
 ha_category:
   - Binary Sensor
+  - Button
   - Climate
   - Hub
   - Light
   - Sensor
-  - Button
   - Switch
 ha_iot_class: Local Push
 ha_release: '0.50'
@@ -25,7 +25,7 @@ ha_platforms:
   - light
   - sensor
   - switch
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The `velbus` integration is used to control [Velbus](https://www.velbus.eu/?lang=en) modules. It supports the Velbus USB, Velbus serial and a TCP/IP gateway.
diff --git a/source/_integrations/verisure.markdown b/source/_integrations/verisure.markdown
index 25355673191..562639cb969 100644
--- a/source/_integrations/verisure.markdown
+++ b/source/_integrations/verisure.markdown
@@ -24,7 +24,7 @@ ha_platforms:
   - switch
 ha_config_flow: true
 ha_dhcp: true
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 Home Assistant has support to integrate your [Verisure](https://www.verisure.com/) devices.
diff --git a/source/_integrations/vizio.markdown b/source/_integrations/vizio.markdown
index 844268954bc..ed77ebe403b 100644
--- a/source/_integrations/vizio.markdown
+++ b/source/_integrations/vizio.markdown
@@ -13,7 +13,7 @@ ha_domain: vizio
 ha_zeroconf: true
 ha_platforms:
   - media_player
-ha_integration_type: integration
+ha_integration_type: hub
 ---
 
 The `vizio` integration allows you to control [SmartCast](https://www.vizio.com/smartcast-app)-compatible TVs and sound bars (2016+ models).
diff --git a/source/_integrations/watttime.markdown b/source/_integrations/watttime.markdown
index 029e576ce11..29bf03abdba 100644
--- a/source/_integrations/watttime.markdown
+++ b/source/_integrations/watttime.markdown
@@ -12,7 +12,7 @@ ha_config_flow: true
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The `watttime` integration allows users to get real-time emissions data for a latitude/longitude from [WattTime](https://www.watttime.org).
diff --git a/source/_integrations/webhook.markdown b/source/_integrations/webhook.markdown
index 53ff11cb9d8..23f283bc1cd 100644
--- a/source/_integrations/webhook.markdown
+++ b/source/_integrations/webhook.markdown
@@ -5,7 +5,6 @@ ha_category:
   - Automation
 ha_release: 0.8
 ha_quality_scale: internal
-ha_category: []
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: webhook
diff --git a/source/_integrations/webostv.markdown b/source/_integrations/webostv.markdown
index 0feda64ba5b..1d4e372a936 100644
--- a/source/_integrations/webostv.markdown
+++ b/source/_integrations/webostv.markdown
@@ -13,6 +13,7 @@ ha_domain: webostv
 ha_config_flow: true
 ha_ssdp: true
 ha_platforms:
+  - diagnostics
   - media_player
   - notify
 ha_quality_scale: platinum
diff --git a/source/_integrations/whois.markdown b/source/_integrations/whois.markdown
index 443f751940a..4c3c533564d 100644
--- a/source/_integrations/whois.markdown
+++ b/source/_integrations/whois.markdown
@@ -12,7 +12,7 @@ ha_codeowners:
 ha_platforms:
   - diagnostics
   - sensor
-ha_integration_type: integration
+ha_integration_type: service
 ---
 
 The Whois integration allows you to perform daily WHOIS lookups against your owned domains. This provides you with information such as `expiration_date`, `name_servers` and `registrar` details.
diff --git a/source/_integrations/wled.markdown b/source/_integrations/wled.markdown
index 46d171701d5..3543b6648c6 100644
--- a/source/_integrations/wled.markdown
+++ b/source/_integrations/wled.markdown
@@ -24,7 +24,7 @@ ha_platforms:
   - sensor
   - switch
   - update
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 [WLED](https://kno.wled.ge) is a fast and feature-rich
diff --git a/source/_integrations/xiaomi_miio.markdown b/source/_integrations/xiaomi_miio.markdown
index a1b03de5106..eb097afbfe6 100644
--- a/source/_integrations/xiaomi_miio.markdown
+++ b/source/_integrations/xiaomi_miio.markdown
@@ -16,7 +16,6 @@ ha_codeowners:
   - '@rytilahti'
   - '@syssi'
   - '@starkillerOG'
-  - '@bieniu'
 ha_domain: xiaomi_miio
 ha_config_flow: true
 ha_zeroconf: true
diff --git a/source/_integrations/yi.markdown b/source/_integrations/yi.markdown
index 9aac380aae6..381fe0aae2d 100644
--- a/source/_integrations/yi.markdown
+++ b/source/_integrations/yi.markdown
@@ -10,7 +10,7 @@ ha_codeowners:
 ha_domain: yi
 ha_platforms:
   - camera
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 The `yi` camera platform allows you to utilize [Yi Home Cameras](https://www.yitechnology.com/) within Home Assistant. Specifically, this platform supports the line of Yi Home Cameras that are based on the Hi3518e Chipset. This includes:
diff --git a/source/_integrations/zamg.markdown b/source/_integrations/zamg.markdown
index 27aa4ce9941..46f23227abc 100644
--- a/source/_integrations/zamg.markdown
+++ b/source/_integrations/zamg.markdown
@@ -12,6 +12,8 @@ ha_platforms:
   - sensor
   - weather
 ha_integration_type: integration
+ha_codeowners:
+  - '@killer0071234'
 ---
 
 The `zamg` platform uses meteorological details published by the Austrian weather service [Zentralanstalt für Meteorologie und Geodynamik (ZAMG)](https://www.zamg.ac.at).
diff --git a/source/_integrations/zone.markdown b/source/_integrations/zone.markdown
index 04c050ae77b..b6dcda19278 100644
--- a/source/_integrations/zone.markdown
+++ b/source/_integrations/zone.markdown
@@ -9,7 +9,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: zone
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 Zones allow you to specify certain regions on earth (for now). When a device tracker sees a device to be within a zone, the state will take the name from the zone. Zones can also be used as a [trigger](/docs/automation/trigger#zone-trigger) or [condition](/docs/scripts/conditions/#zone-condition) inside automation setups.
diff --git a/source/_integrations/zwave_js.markdown b/source/_integrations/zwave_js.markdown
index 33374625c28..a7852001cdf 100644
--- a/source/_integrations/zwave_js.markdown
+++ b/source/_integrations/zwave_js.markdown
@@ -40,7 +40,7 @@ ha_platforms:
   - siren
   - switch
   - update
-ha_integration_type: integration
+ha_integration_type: hub
 ha_zeroconf: true
 ---