diff --git a/homeassistant/components/ambiclimate/config_flow.py b/homeassistant/components/ambiclimate/config_flow.py
index a6dbe60a761..083f55abd8e 100644
--- a/homeassistant/components/ambiclimate/config_flow.py
+++ b/homeassistant/components/ambiclimate/config_flow.py
@@ -38,8 +38,7 @@ def register_flow_implementation(hass, client_id, client_secret):
     }
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class AmbiclimateFlowHandler(config_entries.ConfigFlow):
+class AmbiclimateFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/arcam_fmj/config_flow.py b/homeassistant/components/arcam_fmj/config_flow.py
index 31735a0a037..bc63e551e50 100644
--- a/homeassistant/components/arcam_fmj/config_flow.py
+++ b/homeassistant/components/arcam_fmj/config_flow.py
@@ -18,8 +18,7 @@ def get_entry_client(hass, entry):
     return hass.data[DOMAIN_DATA_ENTRIES][entry.entry_id]
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class ArcamFmjFlowHandler(config_entries.ConfigFlow):
+class ArcamFmjFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/aws/config_flow.py b/homeassistant/components/aws/config_flow.py
index 6ac332b251c..bb8cf10aa17 100644
--- a/homeassistant/components/aws/config_flow.py
+++ b/homeassistant/components/aws/config_flow.py
@@ -5,8 +5,7 @@ from homeassistant import config_entries
 from .const import DOMAIN
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class AWSFlowHandler(config_entries.ConfigFlow):
+class AWSFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/daikin/config_flow.py b/homeassistant/components/daikin/config_flow.py
index 619f9c8d1d8..2255f012023 100644
--- a/homeassistant/components/daikin/config_flow.py
+++ b/homeassistant/components/daikin/config_flow.py
@@ -17,8 +17,7 @@ from .const import CONF_UUID, DOMAIN, KEY_MAC, TIMEOUT
 _LOGGER = logging.getLogger(__name__)
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class FlowHandler(config_entries.ConfigFlow):
+class FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/emulated_roku/config_flow.py b/homeassistant/components/emulated_roku/config_flow.py
index f002178b40a..1dcf0fa5eac 100644
--- a/homeassistant/components/emulated_roku/config_flow.py
+++ b/homeassistant/components/emulated_roku/config_flow.py
@@ -16,8 +16,7 @@ def configured_servers(hass):
     }
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class EmulatedRokuFlowHandler(config_entries.ConfigFlow):
+class EmulatedRokuFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle an emulated_roku config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/fritz/config_flow.py b/homeassistant/components/fritz/config_flow.py
index ba048e97759..801da0eaa1d 100644
--- a/homeassistant/components/fritz/config_flow.py
+++ b/homeassistant/components/fritz/config_flow.py
@@ -28,8 +28,7 @@ from .const import (
 _LOGGER = logging.getLogger(__name__)
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class FritzBoxToolsFlowHandler(ConfigFlow):
+class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a FRITZ!Box Tools config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/heos/config_flow.py b/homeassistant/components/heos/config_flow.py
index efffb93e978..26afcc8daac 100644
--- a/homeassistant/components/heos/config_flow.py
+++ b/homeassistant/components/heos/config_flow.py
@@ -16,8 +16,7 @@ def format_title(host: str) -> str:
     return f"Controller ({host})"
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class HeosFlowHandler(config_entries.ConfigFlow):
+class HeosFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Define a flow for HEOS."""
 
     VERSION = 1
diff --git a/homeassistant/components/homekit_controller/config_flow.py b/homeassistant/components/homekit_controller/config_flow.py
index 4a3deee4d11..1edde453dc8 100644
--- a/homeassistant/components/homekit_controller/config_flow.py
+++ b/homeassistant/components/homekit_controller/config_flow.py
@@ -83,8 +83,7 @@ def ensure_pin_format(pin):
     return "-".join(match.groups())
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class HomekitControllerFlowHandler(config_entries.ConfigFlow):
+class HomekitControllerFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a HomeKit config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/iaqualink/config_flow.py b/homeassistant/components/iaqualink/config_flow.py
index df8880a0e8f..312c76b01f7 100644
--- a/homeassistant/components/iaqualink/config_flow.py
+++ b/homeassistant/components/iaqualink/config_flow.py
@@ -11,8 +11,7 @@ from homeassistant.helpers.typing import ConfigType
 from .const import DOMAIN
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class AqualinkFlowHandler(config_entries.ConfigFlow):
+class AqualinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Aqualink config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/ipma/config_flow.py b/homeassistant/components/ipma/config_flow.py
index 3811d30bfbe..1989e73861a 100644
--- a/homeassistant/components/ipma/config_flow.py
+++ b/homeassistant/components/ipma/config_flow.py
@@ -9,8 +9,7 @@ from .const import DOMAIN, HOME_LOCATION_NAME
 from .weather import FORECAST_MODE
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class IpmaFlowHandler(config_entries.ConfigFlow):
+class IpmaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Config flow for IPMA component."""
 
     VERSION = 1
diff --git a/homeassistant/components/lcn/config_flow.py b/homeassistant/components/lcn/config_flow.py
index fe353cdb4c5..303d253bc18 100644
--- a/homeassistant/components/lcn/config_flow.py
+++ b/homeassistant/components/lcn/config_flow.py
@@ -57,8 +57,7 @@ async def validate_connection(host_name, data):
     return data
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class LcnFlowHandler(config_entries.ConfigFlow):
+class LcnFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a LCN config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/life360/config_flow.py b/homeassistant/components/life360/config_flow.py
index de37068cd56..3dd651930a7 100644
--- a/homeassistant/components/life360/config_flow.py
+++ b/homeassistant/components/life360/config_flow.py
@@ -16,8 +16,7 @@ _LOGGER = logging.getLogger(__name__)
 DOCS_URL = "https://www.home-assistant.io/integrations/life360"
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class Life360ConfigFlow(config_entries.ConfigFlow):
+class Life360ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Life360 integration config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/logi_circle/config_flow.py b/homeassistant/components/logi_circle/config_flow.py
index 00fd0edc437..bc9d4cb0e9e 100644
--- a/homeassistant/components/logi_circle/config_flow.py
+++ b/homeassistant/components/logi_circle/config_flow.py
@@ -54,8 +54,7 @@ def register_flow_implementation(
     }
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class LogiCircleFlowHandler(config_entries.ConfigFlow):
+class LogiCircleFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Config flow for Logi Circle component."""
 
     VERSION = 1
diff --git a/homeassistant/components/luftdaten/config_flow.py b/homeassistant/components/luftdaten/config_flow.py
index 964f2ba1875..1cd09dc993e 100644
--- a/homeassistant/components/luftdaten/config_flow.py
+++ b/homeassistant/components/luftdaten/config_flow.py
@@ -38,8 +38,7 @@ def duplicate_stations(hass):
     return {x for x in stations if stations.count(x) > 1}
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class LuftDatenFlowHandler(config_entries.ConfigFlow):
+class LuftDatenFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a Luftdaten config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/mobile_app/config_flow.py b/homeassistant/components/mobile_app/config_flow.py
index 752ef86d68d..3de3e6be08e 100644
--- a/homeassistant/components/mobile_app/config_flow.py
+++ b/homeassistant/components/mobile_app/config_flow.py
@@ -9,8 +9,7 @@ from homeassistant.helpers import entity_registry as er
 from .const import ATTR_APP_ID, ATTR_DEVICE_NAME, CONF_USER_ID, DOMAIN
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class MobileAppFlowHandler(config_entries.ConfigFlow):
+class MobileAppFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a Mobile App config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index 11f9a397823..bac1f1ba21c 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -32,8 +32,7 @@ from .const import (
 from .util import MQTT_WILL_BIRTH_SCHEMA
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class FlowHandler(config_entries.ConfigFlow):
+class FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/nest/config_flow.py b/homeassistant/components/nest/config_flow.py
index fd5eef34c7d..99aa29c6144 100644
--- a/homeassistant/components/nest/config_flow.py
+++ b/homeassistant/components/nest/config_flow.py
@@ -65,7 +65,6 @@ class UnexpectedStateError(HomeAssistantError):
     """Raised when the config flow is invoked in a 'should not happen' case."""
 
 
-@config_entries.HANDLERS.register(DOMAIN)
 class NestFlowHandler(
     config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
 ):
diff --git a/homeassistant/components/point/config_flow.py b/homeassistant/components/point/config_flow.py
index 1f3cf2a751d..6e735d69c06 100644
--- a/homeassistant/components/point/config_flow.py
+++ b/homeassistant/components/point/config_flow.py
@@ -40,8 +40,7 @@ def register_flow_implementation(hass, domain, client_id, client_secret):
     }
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class PointFlowHandler(config_entries.ConfigFlow):
+class PointFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/ps4/config_flow.py b/homeassistant/components/ps4/config_flow.py
index a494b96abf1..616660b6972 100644
--- a/homeassistant/components/ps4/config_flow.py
+++ b/homeassistant/components/ps4/config_flow.py
@@ -31,8 +31,7 @@ PORT_MSG = {UDP_PORT: "port_987_bind_error", TCP_PORT: "port_997_bind_error"}
 PIN_LENGTH = 8
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class PlayStation4FlowHandler(config_entries.ConfigFlow):
+class PlayStation4FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a PlayStation 4 config flow."""
 
     VERSION = CONFIG_ENTRY_VERSION
diff --git a/homeassistant/components/smhi/config_flow.py b/homeassistant/components/smhi/config_flow.py
index a8cfdba5be5..1dd8f4b15ca 100644
--- a/homeassistant/components/smhi/config_flow.py
+++ b/homeassistant/components/smhi/config_flow.py
@@ -21,8 +21,7 @@ def smhi_locations(hass: HomeAssistant):
     }
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class SmhiFlowHandler(config_entries.ConfigFlow):
+class SmhiFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Config flow for SMHI component."""
 
     VERSION = 1
diff --git a/homeassistant/components/somfy/config_flow.py b/homeassistant/components/somfy/config_flow.py
index 5e7b5793977..a302cdd8887 100644
--- a/homeassistant/components/somfy/config_flow.py
+++ b/homeassistant/components/somfy/config_flow.py
@@ -7,8 +7,9 @@ from homeassistant.helpers import config_entry_oauth2_flow
 from .const import DOMAIN
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class SomfyFlowHandler(config_entry_oauth2_flow.AbstractOAuth2FlowHandler):
+class SomfyFlowHandler(
+    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
+):
     """Config flow to handle Somfy OAuth2 authentication."""
 
     DOMAIN = DOMAIN
diff --git a/homeassistant/components/tellduslive/config_flow.py b/homeassistant/components/tellduslive/config_flow.py
index bd16993b57e..e7de5e12b80 100644
--- a/homeassistant/components/tellduslive/config_flow.py
+++ b/homeassistant/components/tellduslive/config_flow.py
@@ -29,8 +29,7 @@ KEY_TOKEN_SECRET = "token_secret"
 _LOGGER = logging.getLogger(__name__)
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class FlowHandler(config_entries.ConfigFlow):
+class FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/tradfri/config_flow.py b/homeassistant/components/tradfri/config_flow.py
index e02ac69de36..0c1fa9bb744 100644
--- a/homeassistant/components/tradfri/config_flow.py
+++ b/homeassistant/components/tradfri/config_flow.py
@@ -29,8 +29,7 @@ class AuthError(Exception):
         self.code = code
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class FlowHandler(config_entries.ConfigFlow):
+class FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/vesync/config_flow.py b/homeassistant/components/vesync/config_flow.py
index f930619d00b..d81528fe0d1 100644
--- a/homeassistant/components/vesync/config_flow.py
+++ b/homeassistant/components/vesync/config_flow.py
@@ -17,8 +17,7 @@ def configured_instances(hass):
     return hass.config_entries.async_entries(DOMAIN)
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class VeSyncFlowHandler(config_entries.ConfigFlow):
+class VeSyncFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
diff --git a/homeassistant/components/zwave/config_flow.py b/homeassistant/components/zwave/config_flow.py
index 18c5d2f6f4e..b40876bffc3 100644
--- a/homeassistant/components/zwave/config_flow.py
+++ b/homeassistant/components/zwave/config_flow.py
@@ -14,8 +14,7 @@ from .const import (
 )
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class ZwaveFlowHandler(config_entries.ConfigFlow):
+class ZwaveFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a Z-Wave config flow."""
 
     VERSION = 1