diff --git a/homeassistant/components/accuweather/diagnostics.py b/homeassistant/components/accuweather/diagnostics.py
index e4305eb747a..f307c6b5335 100644
--- a/homeassistant/components/accuweather/diagnostics.py
+++ b/homeassistant/components/accuweather/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for AccuWeather."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE
@@ -14,7 +16,7 @@ TO_REDACT = {CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: AccuWeatherDataUpdateCoordinator = hass.data[DOMAIN][
         config_entry.entry_id
diff --git a/homeassistant/components/airly/diagnostics.py b/homeassistant/components/airly/diagnostics.py
index 2471ba90eea..bb270e6a664 100644
--- a/homeassistant/components/airly/diagnostics.py
+++ b/homeassistant/components/airly/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Airly."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -19,7 +21,7 @@ TO_REDACT = {CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_UNIQUE_ID}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: AirlyDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
 
diff --git a/homeassistant/components/brother/diagnostics.py b/homeassistant/components/brother/diagnostics.py
index 239d4916d6b..4e2b64b4f56 100644
--- a/homeassistant/components/brother/diagnostics.py
+++ b/homeassistant/components/brother/diagnostics.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from dataclasses import asdict
+from typing import Any
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -12,7 +13,7 @@ from .const import DATA_CONFIG_ENTRY, DOMAIN
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: BrotherDataUpdateCoordinator = hass.data[DOMAIN][DATA_CONFIG_ENTRY][
         config_entry.entry_id
diff --git a/homeassistant/components/co2signal/diagnostics.py b/homeassistant/components/co2signal/diagnostics.py
index 24f47f96da0..8ab09b8cb75 100644
--- a/homeassistant/components/co2signal/diagnostics.py
+++ b/homeassistant/components/co2signal/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for CO2Signal."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
@@ -13,7 +15,7 @@ TO_REDACT = {CONF_API_KEY}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: CO2SignalCoordinator = hass.data[DOMAIN][config_entry.entry_id]
 
diff --git a/homeassistant/components/coinbase/diagnostics.py b/homeassistant/components/coinbase/diagnostics.py
index 54d4168776c..674ce9dca28 100644
--- a/homeassistant/components/coinbase/diagnostics.py
+++ b/homeassistant/components/coinbase/diagnostics.py
@@ -1,5 +1,7 @@
 """Diagnostics support for Coinbase."""
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_API_TOKEN, CONF_ID
@@ -20,7 +22,7 @@ TO_REDACT = {
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     instance: CoinbaseData = hass.data[DOMAIN][entry.entry_id]
 
diff --git a/homeassistant/components/environment_canada/diagnostics.py b/homeassistant/components/environment_canada/diagnostics.py
index f1064cea52e..297f4664fb0 100644
--- a/homeassistant/components/environment_canada/diagnostics.py
+++ b/homeassistant/components/environment_canada/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Environment Canada."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
@@ -13,7 +15,7 @@ TO_REDACT = {CONF_LATITUDE, CONF_LONGITUDE}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinators = hass.data[DOMAIN][config_entry.entry_id]
     weather_coord = coordinators["weather_coordinator"]
diff --git a/homeassistant/components/evil_genius_labs/diagnostics.py b/homeassistant/components/evil_genius_labs/diagnostics.py
index 18b8c8ed572..a6a15165716 100644
--- a/homeassistant/components/evil_genius_labs/diagnostics.py
+++ b/homeassistant/components/evil_genius_labs/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Evil Genius Labs."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -13,7 +15,7 @@ TO_REDACT = {"wiFiSsidDefault", "wiFiSSID"}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: EvilGeniusUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
 
diff --git a/homeassistant/components/fritz/diagnostics.py b/homeassistant/components/fritz/diagnostics.py
index ed45295892b..0322e55a9e0 100644
--- a/homeassistant/components/fritz/diagnostics.py
+++ b/homeassistant/components/fritz/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for AVM FRITZ!Box."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
@@ -14,7 +16,7 @@ TO_REDACT = {CONF_USERNAME, CONF_PASSWORD}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
 
diff --git a/homeassistant/components/fritzbox/diagnostics.py b/homeassistant/components/fritzbox/diagnostics.py
index 403082c4f90..6c50e1311df 100644
--- a/homeassistant/components/fritzbox/diagnostics.py
+++ b/homeassistant/components/fritzbox/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for AVM Fritz!Smarthome."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
@@ -14,7 +16,7 @@ TO_REDACT = {CONF_USERNAME, CONF_PASSWORD}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     data: dict = hass.data[DOMAIN][entry.entry_id]
     coordinator: FritzboxDataUpdateCoordinator = data[CONF_COORDINATOR]
diff --git a/homeassistant/components/gios/diagnostics.py b/homeassistant/components/gios/diagnostics.py
index b056473fbec..954580d5c3f 100644
--- a/homeassistant/components/gios/diagnostics.py
+++ b/homeassistant/components/gios/diagnostics.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from dataclasses import asdict
+from typing import Any
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -12,7 +13,7 @@ from .const import DOMAIN
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: GiosDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
 
diff --git a/homeassistant/components/knx/diagnostics.py b/homeassistant/components/knx/diagnostics.py
index 3dd14aef653..60a41c9a408 100644
--- a/homeassistant/components/knx/diagnostics.py
+++ b/homeassistant/components/knx/diagnostics.py
@@ -29,7 +29,7 @@ TO_REDACT = {
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     diag: dict[str, Any] = {}
     knx_module = hass.data[DOMAIN]
diff --git a/homeassistant/components/nam/diagnostics.py b/homeassistant/components/nam/diagnostics.py
index 759a3cf976b..f3e4a20cc76 100644
--- a/homeassistant/components/nam/diagnostics.py
+++ b/homeassistant/components/nam/diagnostics.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from dataclasses import asdict
+from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
@@ -16,7 +17,7 @@ TO_REDACT = {CONF_PASSWORD, CONF_USERNAME}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: NAMDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
 
diff --git a/homeassistant/components/nanoleaf/diagnostics.py b/homeassistant/components/nanoleaf/diagnostics.py
index 61d7abea989..9783f7854f3 100644
--- a/homeassistant/components/nanoleaf/diagnostics.py
+++ b/homeassistant/components/nanoleaf/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Nanoleaf."""
 from __future__ import annotations
 
+from typing import Any
+
 from aionanoleaf import Nanoleaf
 
 from homeassistant.components.diagnostics import async_redact_data
@@ -14,7 +16,7 @@ from .const import DOMAIN
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     device: Nanoleaf = hass.data[DOMAIN][config_entry.entry_id].device
 
diff --git a/homeassistant/components/nest/diagnostics.py b/homeassistant/components/nest/diagnostics.py
index d350b719608..57ce4291cc6 100644
--- a/homeassistant/components/nest/diagnostics.py
+++ b/homeassistant/components/nest/diagnostics.py
@@ -41,7 +41,7 @@ def _async_get_nest_devices(
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     nest_devices = _async_get_nest_devices(hass, config_entry)
     if not nest_devices:
@@ -64,7 +64,7 @@ async def async_get_device_diagnostics(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     device: DeviceEntry,
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a device."""
     nest_devices = _async_get_nest_devices(hass, config_entry)
     nest_device_id = next(iter(device.identifiers))[1]
diff --git a/homeassistant/components/netatmo/diagnostics.py b/homeassistant/components/netatmo/diagnostics.py
index cac9c695f19..3a30dcd8588 100644
--- a/homeassistant/components/netatmo/diagnostics.py
+++ b/homeassistant/components/netatmo/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Netatmo."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -30,7 +32,7 @@ TO_REDACT = {
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     data_handler: NetatmoDataHandler = hass.data[DOMAIN][config_entry.entry_id][
         DATA_HANDLER
diff --git a/homeassistant/components/nextdns/diagnostics.py b/homeassistant/components/nextdns/diagnostics.py
index 077f2ca2988..2c0d313060f 100644
--- a/homeassistant/components/nextdns/diagnostics.py
+++ b/homeassistant/components/nextdns/diagnostics.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from dataclasses import asdict
+from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
@@ -24,7 +25,7 @@ TO_REDACT = {CONF_API_KEY, CONF_PROFILE_ID, CONF_UNIQUE_ID}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinators = hass.data[DOMAIN][config_entry.entry_id]
 
diff --git a/homeassistant/components/rainforest_eagle/diagnostics.py b/homeassistant/components/rainforest_eagle/diagnostics.py
index a7022048369..f20a20af9e2 100644
--- a/homeassistant/components/rainforest_eagle/diagnostics.py
+++ b/homeassistant/components/rainforest_eagle/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Eagle."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -13,7 +15,7 @@ TO_REDACT = {CONF_CLOUD_ID, CONF_INSTALL_CODE}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: EagleDataCoordinator = hass.data[DOMAIN][config_entry.entry_id]
 
diff --git a/homeassistant/components/screenlogic/diagnostics.py b/homeassistant/components/screenlogic/diagnostics.py
index 33041597b75..63b5c1e61ad 100644
--- a/homeassistant/components/screenlogic/diagnostics.py
+++ b/homeassistant/components/screenlogic/diagnostics.py
@@ -1,5 +1,7 @@
 """Diagnostics for Screenlogic."""
 
+from typing import Any
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
@@ -9,7 +11,7 @@ from .const import DOMAIN
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator: ScreenlogicDataUpdateCoordinator = hass.data[DOMAIN][
         config_entry.entry_id
diff --git a/homeassistant/components/shelly/diagnostics.py b/homeassistant/components/shelly/diagnostics.py
index f73de5fb32d..0a1fa0e21fc 100644
--- a/homeassistant/components/shelly/diagnostics.py
+++ b/homeassistant/components/shelly/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Shelly."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.bluetooth import async_scanner_by_source
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
@@ -15,7 +17,7 @@ TO_REDACT = {CONF_USERNAME, CONF_PASSWORD}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     shelly_entry_data = get_entry_data(hass)[entry.entry_id]
 
diff --git a/homeassistant/components/tibber/diagnostics.py b/homeassistant/components/tibber/diagnostics.py
index 75c76636f5f..991d20e9e2d 100644
--- a/homeassistant/components/tibber/diagnostics.py
+++ b/homeassistant/components/tibber/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Tibber."""
 from __future__ import annotations
 
+from typing import Any
+
 import tibber
 
 from homeassistant.config_entries import ConfigEntry
@@ -11,7 +13,7 @@ from .const import DOMAIN
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     tibber_connection: tibber.Tibber = hass.data[DOMAIN]
 
diff --git a/homeassistant/components/tractive/diagnostics.py b/homeassistant/components/tractive/diagnostics.py
index 879e9d82e7b..6defd91c0fb 100644
--- a/homeassistant/components/tractive/diagnostics.py
+++ b/homeassistant/components/tractive/diagnostics.py
@@ -1,6 +1,8 @@
 """Diagnostics support for Tractive."""
 from __future__ import annotations
 
+from typing import Any
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
@@ -13,7 +15,7 @@ TO_REDACT = {CONF_PASSWORD, CONF_EMAIL, "title", "_id"}
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     trackables = hass.data[DOMAIN][config_entry.entry_id][TRACKABLES]
 
diff --git a/homeassistant/components/tradfri/diagnostics.py b/homeassistant/components/tradfri/diagnostics.py
index c415632faa4..271e2a226fe 100644
--- a/homeassistant/components/tradfri/diagnostics.py
+++ b/homeassistant/components/tradfri/diagnostics.py
@@ -1,7 +1,7 @@
 """Diagnostics support for IKEA Tradfri."""
 from __future__ import annotations
 
-from typing import cast
+from typing import Any, cast
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -12,7 +12,7 @@ from .const import CONF_GATEWAY_ID, COORDINATOR, COORDINATOR_LIST, DOMAIN
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics the Tradfri platform."""
     entry_data = hass.data[DOMAIN][entry.entry_id]
     coordinator_data = entry_data[COORDINATOR]
diff --git a/homeassistant/components/zha/diagnostics.py b/homeassistant/components/zha/diagnostics.py
index 697e7be336c..8b025f6eec8 100644
--- a/homeassistant/components/zha/diagnostics.py
+++ b/homeassistant/components/zha/diagnostics.py
@@ -69,7 +69,7 @@ def shallow_asdict(obj: Any) -> dict:
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     config: dict = hass.data[DATA_ZHA].get(DATA_ZHA_CONFIG, {})
     gateway: ZHAGateway = hass.data[DATA_ZHA][DATA_ZHA_GATEWAY]
@@ -94,7 +94,7 @@ async def async_get_config_entry_diagnostics(
 
 async def async_get_device_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry, device: dr.DeviceEntry
-) -> dict:
+) -> dict[str, Any]:
     """Return diagnostics for a device."""
     zha_device: ZHADevice = async_get_zha_device(hass, device.id)
     device_info: dict[str, Any] = zha_device.zha_device_info